From f61d93aee6a1397ea1a6f54794575f6dc874740d Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Sat, 2 Jan 2021 16:08:43 +0100
Subject: [PATCH] Prefer settings DB for import in case of ambiguity.

---
 src/common/repository/sqlite/SettingsDb.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/repository/sqlite/SettingsDb.cxx b/src/common/repository/sqlite/SettingsDb.cxx
index 910ea424a..736927b55 100644
--- a/src/common/repository/sqlite/SettingsDb.cxx
+++ b/src/common/repository/sqlite/SettingsDb.cxx
@@ -81,12 +81,7 @@ void SettingsDb::initializeDb() {
   FilesystemNode legacyConfigDatabase{myDatabaseDirectory};
   legacyConfigDatabase /= "settings.sqlite3";
 
-  if (legacyConfigFile.exists() && legacyConfigFile.isFile()) {
-    Logger::info("importing old settings from " + legacyConfigFile.getPath());
-
-    mySettingsRepository->save(KeyValueRepositoryConfigfile{legacyConfigFile}.load());
-  }
-  else if (legacyConfigDatabase.exists() && legacyConfigDatabase.isFile()) {
+  if (legacyConfigDatabase.exists() && legacyConfigDatabase.isFile()) {
     Logger::info("importing old settings from " + legacyConfigDatabase.getPath());
 
     try {
@@ -104,6 +99,11 @@ void SettingsDb::initializeDb() {
       Logger::error(err.what());
     }
   }
+  else if (legacyConfigFile.exists() && legacyConfigFile.isFile()) {
+    Logger::info("importing old settings from " + legacyConfigFile.getPath());
+
+    mySettingsRepository->save(KeyValueRepositoryConfigfile(legacyConfigFile).load());
+  }
 
   myDb->setUserVersion(CURRENT_VERSION);
 }