[Pkg-owncloud-commits] [owncloud-client] 62/70: Revert "Re-sync immediatly after "Keep files" when all files were removed"

[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 f40a054cb7e10f29d21c359c9d050a5a610dfcdc
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu May 15 19:29:40 2014 +0200

    Revert "Re-sync immediatly after "Keep files" when all files were removed"
    
    This causes infinite sync loops
    
    This reverts commit 8b469d3992a6631fdf540b178bdbda48be9f8eb1.
---
 src/mirall/folder.cpp    | 3 ---
 src/mirall/folderman.cpp | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 0f5808a..fd9d85a 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -689,9 +689,6 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *
     *cancel = msgBox.clickedButton() == keepBtn;
     if (*cancel) {
         wipe();
-        _lastEtag = QString();
-        // speed up next sync
-        FolderMan::instance()->slotScheduleSync(_alias);
     }
 #endif
 }
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 67627de..b6f170d 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -395,6 +395,10 @@ void FolderMan::slotScheduleSync( const QString& alias )
 {
     if( alias.isEmpty() ) return;
 
+    if( _currentSyncFolder == alias ) {
+        qDebug() << " the current folder is currently syncing.";
+        return;
+    }
     qDebug() << "Schedule folder " << alias << " to sync!";
 
     if( ! _scheduleQueue.contains(alias ) && _folderMap.contains(alias) ) {

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