[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.5/kdelibs/kio/kio
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2010-06-29 23:42:36
Message-ID: 20100629234236.F351DAC8E1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1144459 by sreich:

backport r1144457. fixes some jobs not being unregistered if the weather is just right.



 M  +2 -9      kdynamicjobtracker.cpp  


--- branches/KDE/4.5/kdelibs/kio/kio/kdynamicjobtracker.cpp #1144458:1144459
@@ -68,9 +68,6 @@
 
 void KDynamicJobTracker::registerJob(KJob *job)
 {
-    bool needWidgetTracker = false;
-
-
     if (!d->kuiserverTracker) {
         d->kuiserverTracker = new KUiServerJobTracker();
     }
@@ -84,17 +81,13 @@
 
     if (reply.isValid() && reply.value()) {
         //create a widget tracker in addition to kuiservertracker.
-        needWidgetTracker = true;
-    }
-
-
-    if (needWidgetTracker) {
         if (!d->widgetTracker) {
             d->widgetTracker = new KWidgetJobTracker();
         }
         d->trackers[job].widgetTracker = d->widgetTracker;
         d->trackers[job].widgetTracker->registerJob(job);
     }
+
     Q_ASSERT(d->trackers[job].kuiserverTracker || d->trackers[job].widgetTracker);
 }
 
@@ -103,7 +96,7 @@
     KUiServerJobTracker *kuiserverTracker = d->trackers[job].kuiserverTracker;
     KWidgetJobTracker *widgetTracker = d->trackers[job].widgetTracker;
 
-    if (!(widgetTracker && kuiserverTracker)) {
+    if (!(widgetTracker || kuiserverTracker)) {
         kWarning() << "Tried to unregister a kio job that hasn't been registered.";
         return;
     }
[prev in list] [next in list] [prev in thread] [next in thread]