[Pkg-owncloud-commits] [owncloud-client] 293/333: Don't dead lock when all the files are 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 462ba7d9420598ceaf61e42e05dba6bc983fb063
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Apr 3 17:14:21 2014 +0200

    Don't dead lock when all the files are removed
    
    SyncEngine is on the main thread, no need of the legacy BlockingConnection
---
 src/mirall/folder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 0f8fa66..07844c6 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -583,9 +583,9 @@ void Folder::startSync(const QStringList &pathList)
     connect(_engine.data(), SIGNAL(csyncError(QString)), SLOT(slotSyncError(QString)), Qt::QueuedConnection);
     connect(_engine.data(), SIGNAL(csyncUnavailable()), SLOT(slotCsyncUnavailable()), Qt::QueuedConnection);
 
-    //blocking connection so the message box happens in this thread, but block the csync thread.
+    //direct connection so the message box is blocking the sync.
     connect(_engine.data(), SIGNAL(aboutToRemoveAllFiles(SyncFileItem::Direction,bool*)),
-                    SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)), Qt::BlockingQueuedConnection);
+                    SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)));
     connect(_engine.data(), SIGNAL(transmissionProgress(Progress::Info)), this, SLOT(slotTransmissionProgress(Progress::Info)));
 
     QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);

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