From 765bf3beb5f7fcfa17292d1c62ad6d78e401b69b Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 4 Dec 2014 18:57:07 +0000 Subject: [PATCH] The scheduler incorrectly aborted jobs after a job was restarted () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12285 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-2.0.txt | 2 ++ scheduler/job.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt index 1fb6f832b..dc8d9491c 100644 --- a/CHANGES-2.0.txt +++ b/CHANGES-2.0.txt @@ -11,6 +11,8 @@ CHANGES IN CUPS V2.0.2 - CUPS did not compile without Avahi or mDNSResponder (STR #4523) - ippLength() did not return the correct length for IPP_TAG_CONST string values. + - The scheduler incorrectly aborted jobs after a job was restarted + () CHANGES IN CUPS V2.0.1 diff --git a/scheduler/job.c b/scheduler/job.c index 0d81570d5..35e3cdeb2 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -4738,7 +4738,7 @@ stop_job(cupsd_job_t *job, /* I - Job */ FilterLevel -= job->cost; job->cost = 0; - if (action == CUPSD_JOB_DEFAULT && !job->kill_time) + if (action == CUPSD_JOB_DEFAULT && !job->kill_time && job->backend > 0) job->kill_time = time(NULL) + JobKillDelay; else if (action >= CUPSD_JOB_FORCE) job->kill_time = 0; -- 2.39.2