From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 4 Dec 2014 18:57:07 +0000 (+0000)
Subject: The scheduler incorrectly aborted jobs after a job was restarted
X-Git-Tag: v2.2b1~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=765bf3beb5f7fcfa17292d1c62ad6d78e401b69b;p=thirdparty%2Fcups.git

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 1fb6f832b1..dc8d9491c9 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
+	  (<rdar://problem/19129387>)
 
 
 CHANGES IN CUPS V2.0.1
diff --git a/scheduler/job.c b/scheduler/job.c
index 0d81570d5c..35e3cdeb25 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;