From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 30 May 2019 14:22:51 +0000 (-0400)
Subject: Mirror bug fix from master (Issue #5588)
X-Git-Tag: v2.2.12~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669659ca8886e45354fc7d7750fb87d3fee2d9eb;p=thirdparty%2Fcups.git

Mirror bug fix from master (Issue #5588)
---

diff --git a/CHANGES.md b/CHANGES.md
index 9ac73bd83e..85080447b4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.12 - 2019-05-28
+CHANGES - 2.2.12 - 2019-05-30
 =============================
 
 
@@ -20,6 +20,7 @@ Changes in CUPS v2.2.12
 - The libusb-based USB backend now enforces read limits, improving print speed
   in many cases (Issue #5583)
 - Fixed some compatibility issues with old releases of CUPS (Issue #5587)
+- Fixed a bug in the scheduler job cleanup code (Issue #5588)
 - Fixed a command ordering issue in the Zebra ZPL driver.
 
 
diff --git a/scheduler/job.c b/scheduler/job.c
index cd49a0fbc0..1a7a34ca9f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -447,7 +447,7 @@ cupsdCleanJobs(void)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time);
 
-    if ((job->history_time && job->history_time) < JobHistoryUpdate || !JobHistoryUpdate)
+    if ((job->history_time && job->history_time < JobHistoryUpdate) || !JobHistoryUpdate)
       JobHistoryUpdate = job->history_time;
 
     if ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate)