From 136b69910603688570f48cf23722d73e809019b3 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Feb 2013 16:06:46 +0100 Subject: [PATCH] Make sure to restart sync after folder add. --- src/mirall/application.cpp | 1 + src/mirall/folderman.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 7c238a42c5..676615a6a2 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -706,6 +706,7 @@ void Application::slotAddFolder() qDebug() << "* Folder wizard cancelled"; } _folderMan->setSyncEnabled(true); + _folderMan->slotScheduleAllFolders(); } void Application::slotOpenStatus() diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index 6923027fe1..abde71fca7 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -370,15 +370,17 @@ void FolderMan::slotScheduleSync( const QString& alias ) qDebug() << "Schedule folder " << alias << " to sync!"; if( _currentSyncFolder == alias ) { // the current folder is currently syncing. + return; } - if( _scheduleQueue.contains( alias ) ) { - qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!"; + if( ! _scheduleQueue.contains(alias )) { + _scheduleQueue.append(alias); } else { - _scheduleQueue.append( alias ); - - slotScheduleFolderSync(); + qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!"; } + + slotScheduleFolderSync(); + } void FolderMan::setSyncEnabled( bool enabled )