From 755b18db6163304b5e511135018302a20004e65c Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 12 Sep 2017 13:02:00 +0200 Subject: [PATCH] Folder: Check etag again after active sync #4116 Maybe more things were happening on the server? --- src/gui/folder.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 6446a06ed..ee1a84869 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -817,6 +817,17 @@ void Folder::slotSyncFinished(bool success) void Folder::slotEmitFinishedDelayed() { emit syncFinished(_syncResult); + + // Immediately check the etag again if there was some sync activity. + if ((_syncResult.status() == SyncResult::Success + || _syncResult.status() == SyncResult::Problem) + && (_syncResult.firstItemDeleted() + || _syncResult.firstItemNew() + || _syncResult.firstItemRenamed() + || _syncResult.firstItemUpdated() + || _syncResult.firstNewConflictItem())) { + slotRunEtagJob(); + } } // the progress comes without a folder and the valid path set. Add that here -- 2.30.2