[Pkg-owncloud-commits] [owncloud-client] 59/89: Do not force resync if status is SyncResult::Problem.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bbfb2f2a60975a173b3caa0d76fd4f4935e1758c
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Dec 11 12:58:30 2013 +0100

    Do not force resync if status is SyncResult::Problem.
---
 src/mirall/folder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 177b29f..65d4ee1 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -272,8 +272,8 @@ void Folder::slotPollTimerTimeout()
     qDebug() << "* Polling" << alias() << "for changes. (time since last sync:" << (_timeSinceLastSync.elapsed() / 1000) << "s)";
 
     if (quint64(_timeSinceLastSync.elapsed()) > MirallConfigFile().forceSyncInterval() ||
-            _syncResult.status() != SyncResult::Success ) {
-        qDebug() << "** Force Sync now";
+            !(_syncResult.status() == SyncResult::Success ||_syncResult.status() == SyncResult::Problem)) {
+        qDebug() << "** Force Sync now, state is " << _syncResult.statusString();
         evaluateSync(QStringList());
     } else {
         RequestEtagJob* job = new RequestEtagJob(AccountManager::instance()->account(), remotePath(), this);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git