[Pkg-owncloud-commits] [owncloud-client] 197/211: Setup Dialog: Terminate sync if the new folder is a an actual folder.

[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 542e9890469a8e8b0f0dadbdb974a5ace6a07045
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Oct 24 11:59:56 2014 +0200

    Setup Dialog: Terminate sync if the new folder is a an actual folder.
---
 src/mirall/owncloudsetupwizard.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index 84f4fa6..f9a7212 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -401,7 +401,6 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
         _ocWizard->account()->deleteLater();
         qDebug() << "Rejected the new config, use the old!";
     } else if( result == QDialog::Accepted ) {
-
         Account *newAccount = _ocWizard->account();
         Account *origAccount = AccountManager::instance()->account();
 
@@ -410,6 +409,12 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
             localFolder.append(QLatin1Char('/'));
         }
 
+        Folder *f = folderMan->folderForPath(localFolder);
+        if( f ) {
+            folderMan->setSyncEnabled(false);
+            folderMan->terminateSyncProcess(f->alias());
+        }
+
         bool isInitialSetup = (origAccount == 0);
 
         // check if either the account or the local folder changed, than reinit

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