diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-12-05 12:18:13 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-12-05 12:18:13 -0500 |
| commit | 8c7143551ab03423990c62923209363d760f925f (patch) | |
| tree | 43fe33344de85c907a3d7383d45214dd26537a45 /scheduler/job.c | |
| parent | f337a1b74eb240e18367154ea748a5ef030c022c (diff) | |
| download | cups-8c7143551ab03423990c62923209363d760f925f.tar.gz | |
Fix handling of MaxJobTime 0 (Issue #5438)
Diffstat (limited to 'scheduler/job.c')
| -rw-r--r-- | scheduler/job.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scheduler/job.c b/scheduler/job.c index abd2d49de..da7cb9c08 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -5157,8 +5157,10 @@ update_job(cupsd_job_t *job) /* I - Job to check */ if (cancel_after) job->cancel_time = time(NULL) + ippGetInteger(cancel_after, 0); - else + else if (MaxJobTime > 0) job->cancel_time = time(NULL) + MaxJobTime; + else + job->cancel_time = 0; } } } |