FolderMan: Never schedule paused folders #5290
authorChristian Kamm <mail@ckamm.de>
Tue, 22 Nov 2016 09:53:15 +0000 (10:53 +0100)
committerChristian Kamm <mail@ckamm.de>
Tue, 22 Nov 2016 09:53:15 +0000 (10:53 +0100)
Previously the last folder in the queue was scheduled, regardless
of whether it was paused or not.

src/gui/folderman.cpp

index 7968fcbb3e1931f60655461aae7c725a5bbe22d9..dde3e10dcf9c43af415add0c4cf95914a3c1063e 100644 (file)
@@ -673,12 +673,11 @@ void FolderMan::slotStartScheduledFolderSync()
     }
 
     // Find the first folder in the queue that can be synced.
-    Folder* f = 0;
+    Folder* folder = 0;
     while( !_scheduledFolders.isEmpty() ) {
-        f = _scheduledFolders.dequeue();
-        Q_ASSERT(f);
-
-        if( f->canSync() ) {
+        Folder* g = _scheduledFolders.dequeue();
+        if( g->canSync() ) {
+            folder = g;
             break;
         }
     }
@@ -686,9 +685,9 @@ void FolderMan::slotStartScheduledFolderSync()
     emit scheduleQueueChanged();
 
     // Start syncing this folder!
-    if( f ) {
-        _currentSyncFolder = f;
-        f->startSync( QStringList() );
+    if( folder ) {
+        _currentSyncFolder = folder;
+        folder->startSync( QStringList() );
     }
 }