funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-23 05:43:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for global settings1-9.conf to allow easier scripted reconfiguration.

Browse Source
This commit is contained in:
Pieter Hulshoff
2019-10-30 21:12:51 +01:00
parent d7ee7ac852
commit a762d3c07f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
RetroFE/Source/Main.cpp
View File

@@ -122,10 +122,13 @@ bool ImportConfiguration(Configuration *c)
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
std::string settingsConfPath = Utils::combinePath(configPath, "settings.conf"); std::string settingsConfPath = Utils::combinePath(configPath, "settings");
if(!c->import("", settingsConfPath)) c->import("", "", settingsConfPath + "_saved.conf", false);
for ( int i = 9; i > 0; i--)
c->import("", "", settingsConfPath + std::to_string(i) + ".conf", false);
if(!c->import("", settingsConfPath + ".conf"))
{ {
Logger::write(Logger::ZONE_ERROR, "RetroFE", "Could not import \"" + settingsConfPath + "\""); Logger::write(Logger::ZONE_ERROR, "RetroFE", "Could not import \"" + settingsConfPath + ".conf\"");
return false; return false;
} }

2
RetroFE/Source/Version.cpp
View File

@@ -21,7 +21,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "9"; std::string retrofe_version_minor = "9";
std::string retrofe_version_build = "8"; std::string retrofe_version_build = "9";
std::string Version::getString( ) std::string Version::getString( )