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

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2010-01-21 16:18:58
Message-ID: 1264090738.380706.19965.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1078135 by dfaure:

Backport 1062999: Fix crash after an error happens in a TransferJob.
Fixed for: 4.3.5
CCBUG: 214100 202091 197289 180791


 M  +9 -2      job.cpp  


--- branches/KDE/4.3/kdelibs/kio/kio/job.cpp #1078134:1078135
@@ -1986,10 +1986,15 @@
               offset = 0;
             else if ( res == R_CANCEL )
             {
-                if ( job == m_putJob )
+                if ( job == m_putJob ) {
                     m_putJob->kill( FileCopyJob::Quietly );
-                else
+                    q->removeSubjob(m_putJob);
+                    m_putJob = 0;
+                } else {
                     m_copyJob->kill( FileCopyJob::Quietly );
+                    q->removeSubjob(m_copyJob);
+                    m_copyJob = 0;
+                }
                 q->setError( ERR_USER_CANCELED );
                 q->emitResult();
                 return;
@@ -2076,6 +2081,8 @@
        q->setError( ERR_INTERNAL );
        q->setErrorText( "'Put' job did not send canResume or 'Get' job did not send data!" );
        m_putJob->kill( FileCopyJob::Quietly );
+       q->removeSubjob(m_putJob);
+       m_putJob = 0;
        q->emitResult();
        return;
    }
[prev in list] [next in list] [prev in thread] [next in thread]