[Pkg-owncloud-commits] [owncloud-client] 52/103: Start the folder watcher when new folder are added

[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 ee22f377afed4dea25b656d03374be697be4fb56
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 22 14:15:43 2014 +0200

    Start the folder watcher when new folder are added
    
    Before, we would only set up a file system watcher when we read the
    config at startup.  But we also need to do it in the other case when
    the user configure new folder to watch
---
 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 c4a5a2e..fa9ba13 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -149,7 +149,6 @@ int FolderMan::setupFolders()
   foreach ( const QString& alias, list ) {
     Folder *f = setupFolderFromConfigFile( alias );
     if( f ) {
-        registerFolderMonitor(f);
         slotScheduleSync(alias);
         emit( folderSyncStateChange( f->alias() ) );
     }
@@ -307,6 +306,8 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
     connect(folder, SIGNAL(syncFinished(SyncResult)), SLOT(slotFolderSyncFinished(SyncResult)));
 
     _folderChangeSignalMapper->setMapping( folder, folder->alias() );
+
+    registerFolderMonitor(folder);
     return folder;
 }
 

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