From ceef2f2d461effd3624e540cc0d7b9046f8e8a8f Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 22 Nov 2016 10:53:15 +0100 Subject: [PATCH] FolderMan: Never schedule paused folders #5290 Previously the last folder in the queue was scheduled, regardless of whether it was paused or not. --- src/gui/folderman.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index 7968fcbb3e..dde3e10dcf 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -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() ); } }