[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_Fix_the_job-on-hold?=
From:       Maks Orlovich <maksim () kde ! org>
Date:       2011-05-17 12:35:40
Message-ID: 20110517123540.4B97FA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 92db24adfa941003db1d885df01157056617f30b by Maks Orlovich.
Committed on 08/05/2011 at 20:39.
Pushed by orlovich into branch 'KDE/4.6'.

Fix the job-on-hold reuse logic, which caused the double-POST problem)

adawit, could you please at least READ what you're backporting if you are
going to be this aggressive? Or better yet, please don't backport anything
that's not fixing a critical bug or is trivial, as per:
http://techbase.kde.org/Policies/Minor_Point_Release_Policy

CCMAIL: adawit@kde.org
BUG: 272466

M  +1    -1    kio/kio/scheduler.cpp     

http://commits.kde.org/kdelibs/92db24adfa941003db1d885df01157056617f30b

diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 55da053..9f5607e 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
         bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
 
         if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
-            canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
+            canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
             if (canJobReuse) {
                 KIO::MetaData outgoing = tJob->outgoingMetaData();
                 const QString resume = outgoing.value("resume");


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