mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 22:05:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

We need to call csync_commit in every error cases

Browse source 
Else there will still be outdated tree in the memory and the further sync
will be confused

Relates to #1710
This commit is contained in:
Olivier Goffart 2014-05-15 11:17:13 +02:00
parent 9f6e9f8e1b
commit 90ee274744
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mirall/syncengine.cpp
View file

@ -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();