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 32ac4aa79dc7ecb030ff14f678e90d2889996ea3..91f95e3928b1346034a1317383219e9bd16fa397 100644 (file)
--- 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 db6cfb1ffb22a58061525d1519a993e7d46967b4..fd1d80e21e87b0c00659c87e16f1eddac8d0262b 100644 (file)
--- 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...