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

Minor optimization to settings I/O.

This commit is contained in:
Christian Speckner 2019-05-04 10:42:18 +02:00
parent ab8e5a59d4
commit e015025d90
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emucore/Settings.cxx
View File

@ -205,11 +205,11 @@ void Settings::load(const Options& options)
{
Options fromFile = myRespository->load();
for (const auto& opt: fromFile)
setValue(opt.first, opt.second);
setValue(opt.first, opt.second, false);
// Apply commandline options, which override those from settings file
for(const auto& opt: options)
setValue(opt.first, opt.second);
setValue(opt.first, opt.second, false);
// Finally, validate some settings, so the rest of the codebase
// can assume the values are valid
@ -593,12 +593,12 @@ const Variant& Settings::value(const string& key) const
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Settings::setValue(const string& key, const Variant& value)
void Settings::setValue(const string& key, const Variant& value, bool persist)
{
auto it = myPermanentSettings.find(key);
if(it != myPermanentSettings.end()) {
if (persist && it->second != value) myRespository->save(key, value);
it->second = value;
myRespository->save(key, value);
}
else
myTemporarySettings[key] = value;

2
src/emucore/Settings.hxx
View File

@ -88,7 +88,7 @@ class Settings
@param key The key of the setting
@param value The value to assign to the key
*/
void setValue(const string& key, const Variant& value);
void setValue(const string& key, const Variant& value, bool persist = true);
/**
Convenience methods to return specific types.