The scheduler incorrectly aborted jobs after a job was restarted

(<rdar://problem/19129387>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12285 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 1fb6f832b1d5a48ec80de8c0beb63b881b02b9f9..dc8d9491c9199ad76927b91ec007de797caf635d 100644 (file)
--- 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
+         (<rdar://problem/19129387>)
 
 
 CHANGES IN CUPS V2.0.1

diff --git a/scheduler/job.c b/scheduler/job.c
index 0d81570d5c40b2260094d6245a0b6550ec6bf2de..35e3cdeb25e9da6e78e8143266841373807aff56 100644 (file)
--- 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;