[Pkg-owncloud-commits] [owncloud-client] 56/70: We need to call csync_commit in every error cases

[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 90ee274744c6b59736c564d944d6cd44dc1c65d4
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu May 15 11:17:13 2014 +0200

    We need to call csync_commit in every error cases
    
    Else there will still be outdated tree in the memory and the further sync
    will be confused
    
    Relates to #1710
---
 src/mirall/syncengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 14e42aa..9ff67e1 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -553,6 +553,7 @@ void SyncEngine::slotUpdateFinished(int updateResult)
     if (!_journal->isConnected()) {
         qDebug() << "Bailing out, DB failure";
         emit csyncError(tr("Cannot open the sync journal"));
+        csync_commit(_csync_ctx);
         emit finished();
         _syncMutex.unlock();
         _thread.quit();
@@ -569,6 +570,7 @@ void SyncEngine::slotUpdateFinished(int updateResult)
         emit aboutToRemoveAllFiles(_syncedItems.first()._direction, &cancel);
         if (cancel) {
             qDebug() << Q_FUNC_INFO << "Abort sync";
+            csync_commit(_csync_ctx);
             emit finished();
             _syncMutex.unlock();
             _thread.quit();

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