[Pkg-owncloud-commits] [owncloud-client] 195/211: Unregister path in socketapi before removing it.

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

    Unregister path in socketapi before removing it.
---
 binary                   | 2 +-
 src/mirall/folderman.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/binary b/binary
index 2cc466f..18d9ac8 160000
--- a/binary
+++ b/binary
@@ -1 +1 @@
-Subproject commit 2cc466fd4b4695a2df1033adeadd1d10add718bc
+Subproject commit 18d9ac810b03866e1939d66723d01b544bbdde7e
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 6e7b8db..716bd28 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -698,6 +698,12 @@ bool FolderMan::startFromScratch( const QString& localFolder )
             qDebug() << "startFromScratch: Directory is empty!";
             return true;
         }
+        // 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);
+        }
+
         // Make a backup of the folder/file.
         QString newName = getBackupName( parentDir.absoluteFilePath( folderName ) );
         if( !parentDir.rename( fi.absoluteFilePath(), newName ) ) {

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