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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_Fixed_the_revert_ma?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-04-25 16:16:24
Message-ID: 20110425161624.82FF3A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 1317e6e22057d6080ab4279cfd50330cdd43b522 by Dawit Alemayehu.
Committed on 25/04/2011 at 17:48.
Pushed by adawit into branch 'KDE/4.6'.

Fixed the revert made by commit 870e619624851dc892cac234ac0c91cccbc00ae9:
  - kill() should be performed on m_slaveOnHold and not the null slave variable.
  - Reset the variables that contain the slave-on-hold information once it has
    been used or discarded.

M  +3    -4    kio/kio/scheduler.cpp     

http://commits.kde.org/kdelibs/1317e6e22057d6080ab4279cfd50330cdd43b522

diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index a7af1b0..b8cb5c2 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -1143,7 +1143,6 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
 
     if (jobPriv->m_checkOnHold) {
         slave = Slave::holdSlave(jobPriv->m_protocol, job->url());
-        kDebug(7006) << "HOLD: Reusing held slave (" << slave << ")";
     }
 
     if (!slave && m_slaveOnHold) {
@@ -1167,10 +1166,10 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
                 slave = m_slaveOnHold;
             } else {
                 kDebug(7006) << "HOLD: Discarding held slave (" << slave << ")";
-                if (slave) {
-                    slave->kill();
-                }
+                m_slaveOnHold->kill();
             }
+            m_slaveOnHold = 0;
+            m_urlOnHold.clear();
         }
     }
 

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