Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2017-09-12 14:02:00 +0300
committerMarkus Goetz <markus@woboq.com>2017-09-12 14:58:59 +0300
commit66415831ea747ad990096624cadde60af795bbff (patch)
tree80ddd029e5e4b2c236fdbb5e478e633588f809ac /src/gui/folder.cpp
parent2b7919fb3a9c80f3781b27384920472161b0d0ee (diff)
Folder: Check etag again after active sync #4116
Maybe more things were happening on the server?
Diffstat (limited to 'src/gui/folder.cpp')
-rw-r--r--src/gui/folder.cpp11
1 files changed, 11 insertions, 0 deletions
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