From: Christian Kamm <mail@ckamm.de>
Date: Tue, 22 Nov 2016 09:53:15 +0000 (+0100)
Subject: FolderMan: Never schedule paused folders #5290
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~976^2~8^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ceef2f2d461effd3624e540cc0d7b9046f8e8a8f;p=nextcloud-desktop.git

FolderMan: Never schedule paused folders #5290

Previously the last folder in the queue was scheduled, regardless
of whether it was paused or not.
---

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 7968fcbb3..dde3e10dc 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() );
     }
 }