[Pkg-owncloud-commits] [owncloud-client] 202/211: FolderMan: Use folderForPath method to get the folder object for a path

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:45 UTC 2014


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 86e13ea06fcc0d131b2f3ff44365154f945b960b
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Oct 24 15:07:33 2014 +0200

    FolderMan: Use folderForPath method to get the folder object for a path
---
 src/mirall/folderman.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 762fcf8..5bceae4 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -701,11 +701,10 @@ 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 ) {
-            foreach( Folder *f, _folderMap.values() ) {
-                if(f) {
-                    if( localFolder.startsWith(f->path()) ) {
-                        _socketApi->slotUnregisterPath(f->alias());
-                    }
+            Folder *f = folderForPath(localFolder);
+            if(f) {
+                if( localFolder.startsWith(f->path()) ) {
+                    _socketApi->slotUnregisterPath(f->alias());
                 }
             }
         }

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



More information about the Pkg-owncloud-commits mailing list