From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 17 Nov 2015 19:02:23 +0000 (+0000)
Subject: The scheduler did not deliver job notifications for jobs submitted to classes
X-Git-Tag: v2.2b1~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9924fab8160b96dba17af97434c10c1a9e276326;p=thirdparty%2Fcups.git

The scheduler did not deliver job notifications for jobs submitted to classes
(STR #4733)

A matching job is enough.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12976 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index 32ac4aa79d..91f95e3928 100644
--- a/CHANGES-2.1.txt
+++ b/CHANGES-2.1.txt
@@ -26,6 +26,8 @@ CHANGES IN CUPS V2.1.1
 	  printer (<rdar://problem/22716820>)
 	- Scheduler logging change (STR #4728)
 	- Added USB quirk for Canon MP530 (STR #4730)
+	- The scheduler did not deliver job notifications for jobs submitted to
+	  classes (STR #4733)
 	- Updated localizations (STR #4709)
 
 
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index db6cfb1ffb..fd1d80e21e 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -105,9 +105,7 @@ cupsdAddEvent(
     * Check if this subscription requires this event...
     */
 
-    if ((sub->mask & event) != 0 &&
-        (sub->dest == dest || !sub->dest) &&
-	(sub->job == job || !sub->job))
+    if ((sub->mask & event) != 0 && (sub->dest == dest || !sub->dest || sub->job == job))
     {
      /*
       * Need this event, so create a new event record...