Fix job-completed event notifications for jobs that are canceled before they are...

diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 7c646b953d9360f931e3068556c261dab9c2cd08..eefa7f82e3313717431166063f549a221ed23855 100644 (file)
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -93,6 +93,9 @@ cupsdAddEvent(
   * caches...
   */
 
+  if (job && !dest)
+    dest = cupsdFindPrinter(job->dest);
+
   for (temp = NULL, sub = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions);
        sub;
        sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
@@ -119,11 +122,7 @@ cupsdAddEvent(
       temp->time  = time(NULL);
       temp->attrs = ippNew();
       temp->job          = job;
-
-      if (dest)
-       temp->dest = dest;
-      else if (job)
-       temp->dest = dest = cupsdFindPrinter(job->dest);
+      temp->dest  = dest;
 
      /*
       * Add common event notification attributes...