Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / scheduler / job.c

diff --git a/scheduler/job.c b/scheduler/job.c
index dd3df67a80049ac16c24c960c374169397c24875..4442cacc7fdf7c655d3f8f5ce063bd053f548d1e 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,   /* I - Destination to cancel */
       if (purge)
        cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
                         "Job purged by user.");
-      else
+      else if (job->state_value < IPP_JOB_CANCELED)
        cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
                         "Job canceled by user.");
     }