[Pkg-owncloud-commits] [owncloud-client] 58/70: 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 8b469d3992a6631fdf540b178bdbda48be9f8eb1
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu May 15 11:48:01 2014 +0200

    Re-sync immediatly after "Keep files" when all files were removed
    
    Fixes #1710
---
 src/mirall/folder.cpp    | 3 +++
 src/mirall/folderman.cpp | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index fd9d85a..0f5808a 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -689,6 +689,9 @@ 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 fbed51a..8b6428b 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -394,10 +394,6 @@ 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