Merge changes from CUPS 1.6svn-r9939.

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

diff --git a/scheduler/job.c b/scheduler/job.c
index 08e2f0200c8e2e811afa9e65c71d37ce756136c6..fdd09f0a03abf8dd441d4c5f9b021584b496aced 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2910,7 +2910,6 @@ finalize_job(cupsd_job_t *job,            /* I - Job */
 
     int exit_code;                     /* Exit code from backend */
 
-
    /*
     * Convert the status to an exit code.  Due to the way the W* macros are
     * implemented on MacOS X (bug?), we have to store the exit status in a
@@ -3163,7 +3162,9 @@ finalize_job(cupsd_job_t *job,            /* I - Job */
 
   if (job->history)
   {
-    if (job->status)
+    if (job->status &&
+        (job->state_value == IPP_JOB_ABORTED ||
+         job->state_value == IPP_JOB_STOPPED))
       dump_job_history(job);
     else
       free_job_history(job);