Moving a held job no longer releases it (STR #3839)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9760 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 263e89c85eef5cef05c83a5f3c4c70ff3c62c4ea..6fa5ea36ba8843da3bf7d307e71e425445cb34f2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
-CHANGES.txt - 2011-05-06
+CHANGES.txt - 2011-05-10
 ------------------------
 
 CHANGES IN CUPS V1.5b1
 
+       - Moving a held job no longer releases it (STR #3839)
        - Restored support for GNU TLS and OpenSSL with threading enabled
          (STR #3605)
        - Fixed a confusing error message from cups-polld (STR #3806)

diff --git a/scheduler/job.c b/scheduler/job.c
index 148ea9f2e4ad2b7e521fc35981cc1b496404e658..a010e9fc3bd6322b253f451efd221419d67edf2a 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1871,8 +1871,9 @@ cupsdMoveJob(cupsd_job_t     *job,        /* I - Job */
   * Change the destination information...
   */
 
-  cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT,
-                   "Stopping job prior to move.");
+  if (job->state_value > IPP_JOB_HELD)
+    cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT,
+                    "Stopping job prior to move.");
 
   cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED, oldp, job,
                 "Job #%d moved from %s to %s.", job->id, olddest,