[Pkg-owncloud-commits] [owncloud-client] 27/30: Disable the folder if it is going to be removed.

[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 c8a8eb35fab8359ab0f3e0aa37955a589f710399
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Mar 10 12:22:06 2014 +0100

    Disable the folder if it is going to be removed.
---
 src/mirall/folderman.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index ea4e258..29dafdf 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -537,14 +537,17 @@ void FolderMan::removeFolder( const QString& alias )
     if( _folderMap.contains( alias )) {
         qDebug() << "Removing " << alias;
         f = _folderMap.take( alias );
-        if(f) {
-            f->wipe();
-        }
     } else {
         qDebug() << "!! Can not remove " << alias << ", not in folderMap.";
     }
 
     if( f ) {
+        f->wipe();
+
+        // can be removed if we are able to delete the folder object.
+        f->setSyncEnabled(false);
+
+        // remove the folder configuration
         QFile file( _folderConfigPath + QLatin1Char('/') + f->configFile() );
         if( file.exists() ) {
             qDebug() << "Remove folder config file " << file.fileName();

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