From 2ae1b5dc84cd48522967589349efa790b4f2a794 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Mon, 12 Mar 2012 17:37:18 +0100
Subject: [PATCH] move the poll timer stop to the correct place just before
 starting to sync.

---
 src/mirall/folder.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 9396bdb899..4f98067157 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -163,6 +163,10 @@ void Folder::evaluateSync(const QStringList &pathList)
     return;
   }
 
+  // stop the poll timer here. Its started again in the slot of
+  // sync finished.
+  qDebug() << "* " << alias() << "Poll timer disabled";
+  _pollTimer->stop();
   startSync( pathList );
 }
 
@@ -172,8 +176,6 @@ void Folder::slotPollTimerTimeout()
 #ifdef USE_WATCHER
     _watcher->clearPendingEvents();
 #endif
-    qDebug() << "* " << alias() << "Poll timer disabled";
-    _pollTimer->stop();
     evaluateSync(QStringList());
 }