[Pkg-owncloud-commits] [owncloud-client] 20/70: Syncengine: Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit

[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 0880444e37a992068c5d8b04143bb484accb0a06
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 18 15:04:55 2014 +0200

    Syncengine:  Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit
    
    The legacy job might still need the neon session and the propagator.
    We need to make sure the thread exits before.
    
    This fixes crash when pausing a sync made with the legacy jobs
    (for example when there is network limitation)
    This should fix https://github.com/owncloud/enterprise/issues/200
---
 src/mirall/syncengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index b5f4fcc..eacfd08 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -663,14 +663,14 @@ void SyncEngine::slotFinished()
 
 void SyncEngine::finalize()
 {
+    _thread.quit();
+    _thread.wait();
     csync_commit(_csync_ctx);
 
     qDebug() << "CSync run took " << _stopWatch.addLapTime(QLatin1String("Sync Finished"));
     _stopWatch.stop();
 
     _propagator.reset(0);
-    _thread.quit();
-    _thread.wait();
     _syncRunning = false;
     emit finished();
 }

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