From fb4728c7ee99f484ee7c0d30a9ed48a40d80296c Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Wed, 9 Oct 2013 14:19:34 +0200
Subject: [PATCH] Handle sync enable flag correctly in folder scheduling.

This fixes bug #1083.

Conflicts:
	src/mirall/folder.cpp
---
 src/mirall/folder.cpp    | 1 +
 src/mirall/folderman.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index eb700e6ce..9be298f03 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -433,6 +433,7 @@ void Folder::slotTerminateSync()
     _csyncError = true;
     qDebug() << "-> CSync Terminated!";
     slotCSyncFinished();
+    setSyncEnabled(false);
 }
 
 // This removes the csync File database if the sync folder definition is removed
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 67c53c961..8a198d0b5 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -391,8 +391,8 @@ void FolderMan::slotScheduleFolderSync()
         if( _folderMap.contains( alias ) ) {
             ownCloudInfo::instance()->getQuotaRequest("/");
             Folder *f = _folderMap[alias];
-            _currentSyncFolder = alias;
-            if (f->syncEnabled()) {
+            if( f->syncEnabled() ) {
+                _currentSyncFolder = alias;
                 f->startSync( QStringList() );
             }
         }