From 542e9890469a8e8b0f0dadbdb974a5ace6a07045 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 24 Oct 2014 11:59:56 +0200 Subject: [PATCH 1/2] 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 84f4fa6da3..f9a7212889 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 From a9d8e9dcd8505ae0d6464b6352417141188033cb Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 24 Oct 2014 13:05:29 +0200 Subject: [PATCH 2/2] Setupwizard: Close the database in case of moving the folder. --- src/mirall/owncloudsetupwizard.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index f9a7212889..3dcfd8d98c 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -413,6 +413,7 @@ void OwncloudSetupWizard::slotAssistantFinished( int result ) if( f ) { folderMan->setSyncEnabled(false); folderMan->terminateSyncProcess(f->alias()); + f->journalDb()->close(); } bool isInitialSetup = (origAccount == 0);