[Pkg-owncloud-commits] [owncloud-client] 196/211: Followup: To unregister a path in socket api use the alias of folder.

[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 f5c199740d6d792d32e476f772cfbea2394fdfa3
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Oct 24 11:36:01 2014 +0200

    Followup: To unregister a path in socket api use the alias of folder.
---
 src/mirall/folderman.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 716bd28..762fcf8 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -701,7 +701,13 @@ bool FolderMan::startFromScratch( const QString& localFolder )
         // Disconnect the socket api from the database to avoid that locking of the
         // db file does not allow to move this dir.
         if( _socketApi ) {
-            _socketApi->slotUnregisterPath(localFolder);
+            foreach( Folder *f, _folderMap.values() ) {
+                if(f) {
+                    if( localFolder.startsWith(f->path()) ) {
+                        _socketApi->slotUnregisterPath(f->alias());
+                    }
+                }
+            }
         }
 
         // Make a backup of the folder/file.

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