From: Christian Kamm <mail@ckamm.de>
Date: Tue, 12 Sep 2017 11:02:00 +0000 (+0200)
Subject: Folder: Check etag again after active sync #4116
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~701^2~114
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=755b18db6163304b5e511135018302a20004e65c;p=nextcloud-desktop.git

Folder: Check etag again after active sync #4116

Maybe more things were happening on the server?
---

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