Merge remote-tracking branch 'origin/2.10'

1 files changed, 5 insertions, 3 deletions

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 2ca61d99d..d1af68ba8 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -149,9 +149,11 @@ FolderMan::FolderMan(QObject *parent)
     _socketApi.reset(new SocketApi);
 
     // Set the remote poll interval fixed to 10 seconds.
-    // That does not mean that it polls every 10 seconds, but it checks every 10 secs
-    // if one of the folders is due to sync.
-    _etagPollTimer.setInterval(1000);
+    // That does not mean that it polls every 10 seconds, but it checks every 10 seconds
+    // if one of the folders is due to sync. This means that if the server advertises a
+    // pollinterval that is not a multiple of 10 seconds, then that pollinterval will be
+    // rounded up to the next 10 seconds in practice. 10-second granularity is acceptable.
+    _etagPollTimer.setInterval(10s);
     QObject::connect(&_etagPollTimer, &QTimer::timeout, this, &FolderMan::slotEtagPollTimerTimeout);
     _etagPollTimer.start();