Merge easysw-1.4svn-r7834

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

diff --git a/scheduler/job.c b/scheduler/job.c
index e0bd77534006150ce34de4385fe410eacb1e7bd3..e2d74c6329e22191daceb31b0327e65b19996248 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -659,11 +659,13 @@ cupsdFinishJob(cupsd_job_t *job)  /* I - Job */
          cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 
         /*
-         * If the job was queued to a class, try requeuing it...  For
-         * faxes and retry-job queues, hold the current job for 5 minutes.
+         * If the job was queued to a class or the error policy is
+         * "retry-current-job", try requeuing it...  For faxes and retry-job
+         * queues, hold the current job for 5 minutes.
          */
 
-         if (job->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT))
+         if ((job->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) ||
+             !strcmp(printer->error_policy, "retry-current-job"))
            cupsdCheckJobs();
          else if ((printer->type & CUPS_PRINTER_FAX) ||
                   !strcmp(printer->error_policy, "retry-job"))