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

List:       kde-commits
Subject:    KDE/kdenetwork/kget
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2011-05-17 16:15:34
Message-ID: 20110517161534.CE8A2AC76D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1232455 by lappelhans:

Don't restart a download if it's Aborted and in a manualsolve state

CCMAIL:eortiz@uci.cu


 M  +4 -2      core/scheduler.cpp  
 M  +1 -1      core/transfer.h  
 M  +1 -4      transfer-plugins/mmsthreads/mmstransfer.cpp  


--- trunk/KDE/kdenetwork/kget/core/scheduler.cpp #1232454:1232455
@@ -313,12 +313,14 @@
     if( job->jobQueue()->status() == JobQueue::Stopped )
     {
         return ( (policy == Job::Start)   &&
-                 (status != Job::Finished) );
+                 ((status != Job::Finished) &&
+                 (status != Job::Aborted || job->error().type == \
Job::AutomaticRetry)));  }
     else                           //JobQueue::Running
     {
         return ( (policy != Job::Stop)    &&
-                 (status != Job::Finished) );
+                 ((status != Job::Finished) ||
+                 (status != Job::Aborted || job->error().type == \
Job::AutomaticRetry)));  }
 }
 
--- trunk/KDE/kdenetwork/kget/core/transfer.h #1232454:1232455
@@ -167,7 +167,7 @@
         KIO::filesize_t downloadedSize() const {return m_downloadedSize;}
         KIO::filesize_t uploadedSize() const   {return m_uploadedSize;}
         QString statusText() const             {return m_statusText;}
-        QPixmap statusPixmap() const           {return m_statusPixmap;}
+        QPixmap statusPixmap() const           {return (error().pixmap.isNull() ? \
m_statusPixmap : error().pixmap);}  
         static QString statusText(Job::Status status);
         static QPixmap statusPixmap(Job::Status status);
--- trunk/KDE/kdenetwork/kget/transfer-plugins/mmsthreads/mmstransfer.cpp \
#1232454:1232455 @@ -143,12 +143,9 @@
 
 void MmsTransfer::slotBrokenUrl()
 {
-    //FIXME: It continue trying of download and never stop, if you stop the download \
                it show
-    //you the error.
-    setPolicy(Stop); // This is a patch for the problem!!
     setError(i18n("Download failed, could not access this URL."), \
SmallIcon("dialog-cancel"),  Job::NotSolveable);
-    setTransferChange(Tc_Status);
+    setTransferChange(Tc_Status, true);
 }
 
 void MmsTransfer::slotNotAllowMultiDownload()


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