[Pkg-owncloud-commits] [owncloud-client] 33/89: When reconfiguring, we need to clear the _currentSyncFolder

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 89d1e2d924bbc0cf5de818a607eb255daa9a7622
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Dec 9 16:49:41 2013 +0100

    When reconfiguring, we need to clear the _currentSyncFolder
    
    Else, if we reconfigure when the folder is syncing, it may be impossible to
    sync again.
    This happens for example when changing the password when the folder is
    syncing
---
 src/mirall/folderman.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 9b9c013..e9cf086 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -84,6 +84,7 @@ int FolderMan::unloadAllFolders()
         delete _folderMap.take( i.key() );
         cnt++;
     }
+    _currentSyncFolder.clear();
     return cnt;
 }
 
@@ -347,7 +348,7 @@ void FolderMan::slotScheduleSync( const QString& alias )
 
     qDebug() << "Schedule folder " << alias << " to sync!";
     if( _currentSyncFolder == alias ) {
-        // the current folder is currently syncing.
+        qDebug() << " the current folder is currently syncing.";
         return;
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git