mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 22:05:53 +03:00
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
This commit is contained in:
parent
9f6e9f8e1b
commit
90ee274744
1 changed files with 2 additions and 0 deletions
|
@ -553,6 +553,7 @@ void SyncEngine::slotUpdateFinished(int updateResult)
|
||||||
if (!_journal->isConnected()) {
|
if (!_journal->isConnected()) {
|
||||||
qDebug() << "Bailing out, DB failure";
|
qDebug() << "Bailing out, DB failure";
|
||||||
emit csyncError(tr("Cannot open the sync journal"));
|
emit csyncError(tr("Cannot open the sync journal"));
|
||||||
|
csync_commit(_csync_ctx);
|
||||||
emit finished();
|
emit finished();
|
||||||
_syncMutex.unlock();
|
_syncMutex.unlock();
|
||||||
_thread.quit();
|
_thread.quit();
|
||||||
|
@ -569,6 +570,7 @@ void SyncEngine::slotUpdateFinished(int updateResult)
|
||||||
emit aboutToRemoveAllFiles(_syncedItems.first()._direction, &cancel);
|
emit aboutToRemoveAllFiles(_syncedItems.first()._direction, &cancel);
|
||||||
if (cancel) {
|
if (cancel) {
|
||||||
qDebug() << Q_FUNC_INFO << "Abort sync";
|
qDebug() << Q_FUNC_INFO << "Abort sync";
|
||||||
|
csync_commit(_csync_ctx);
|
||||||
emit finished();
|
emit finished();
|
||||||
_syncMutex.unlock();
|
_syncMutex.unlock();
|
||||||
_thread.quit();
|
_thread.quit();
|
||||||
|
|
Loading…
Reference in a new issue