From 4745b6a2400f75b0d89b0b904d265cb1b156d2ab Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 8 Jun 2019 18:17:25 -0230 Subject: [PATCH] Make sure properties database is correctly read on startup (fixes #475). --- src/emucore/OSystem.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 86202ec46..df15cfdab 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -125,9 +125,6 @@ OSystem::~OSystem() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool OSystem::create() { - // Get updated paths for all configuration files - setConfigPaths(); - ostringstream buf; buf << "Stella " << STELLA_VERSION << endl << " Features: " << myFeatures << endl @@ -187,6 +184,8 @@ bool OSystem::create() myPNGLib = make_unique(*this); #endif + myPropSet->load(myPropertiesFile); + return true; } @@ -227,7 +226,8 @@ void OSystem::loadConfig(const Settings::Options& options) mySettings->load(options); mySettingsLoaded = true; - myPropSet->load(myPropertiesFile); + // Get updated paths for all configuration files + setConfigPaths(); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -