ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer settings DB for import in case of ambiguity.

This commit is contained in:
Christian Speckner 2021-01-02 16:08:43 +01:00
parent a9e2a99f53
commit f61d93aee6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/repository/sqlite/SettingsDb.cxx
View File

@ -81,12 +81,7 @@ void SettingsDb::initializeDb() {
FilesystemNode legacyConfigDatabase{myDatabaseDirectory}; FilesystemNode legacyConfigDatabase{myDatabaseDirectory};
legacyConfigDatabase /= "settings.sqlite3"; legacyConfigDatabase /= "settings.sqlite3";
if (legacyConfigFile.exists() && legacyConfigFile.isFile()) { if (legacyConfigDatabase.exists() && legacyConfigDatabase.isFile()) {
Logger::info("importing old settings from " + legacyConfigFile.getPath());
mySettingsRepository->save(KeyValueRepositoryConfigfile{legacyConfigFile}.load());
}
else if (legacyConfigDatabase.exists() && legacyConfigDatabase.isFile()) {
Logger::info("importing old settings from " + legacyConfigDatabase.getPath()); Logger::info("importing old settings from " + legacyConfigDatabase.getPath());
try { try {
@ -104,6 +99,11 @@ void SettingsDb::initializeDb() {
Logger::error(err.what()); 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); myDb->setUserVersion(CURRENT_VERSION);
} }