summaryrefslogtreecommitdiff
path: root/scheduler/job.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-12-04 18:57:07 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2014-12-04 18:57:07 +0000
commit765bf3beb5f7fcfa17292d1c62ad6d78e401b69b (patch)
tree616be8adb65e5ddbf061f8267e478433ebc6fe12 /scheduler/job.c
parent426184cbf406be1837d3f6507e0c965f8894fa44 (diff)
downloadcups-765bf3beb5f7fcfa17292d1c62ad6d78e401b69b.tar.gz
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
Diffstat (limited to 'scheduler/job.c')
-rw-r--r--scheduler/job.c2
1 files changed, 1 insertions, 1 deletions
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;