[Pkg-owncloud-commits] [owncloud-client] 424/498: FolderMan: Fix up previous commit #3528

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:13 UTC 2015


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 d51bd94447a5db4418def6d6bba003f1d9e331f5
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Jul 31 18:31:54 2015 +0200

    FolderMan: Fix up previous commit #3528
---
 src/gui/folderman.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index e6a156b..c7ae935 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -198,7 +198,11 @@ int FolderMan::setupFolders()
     auto settings = Account::settingsWithGroup(QLatin1String("Accounts"));
     const auto accountsWithSettings = settings->childGroups();
     if (accountsWithSettings.isEmpty()) {
-        return setupFoldersMigration();
+        int r = setupFoldersMigration();
+        if (r > 0) {
+            AccountManager::instance()->save();
+        }
+        return r;
     }
 
     qDebug() << "* Setup folders from settings file";
@@ -414,7 +418,7 @@ Folder* FolderMan::setupFolderFromOldConfigFile(const QString &file, AccountStat
 
         folder->saveToSettings();
     }
-    qDebug() << "Migrated!";
+    qDebug() << "Migrated!" << folder;
     settings.sync();
     return folder;
 }

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



More information about the Pkg-owncloud-commits mailing list