This fixes save files reading/writing

This commit is contained in:
clobber 2012-08-17 02:12:31 -05:00
parent 38f006e00e
commit 4cab51f229

View File

@ -1093,14 +1093,14 @@ int MDFNI_Initialize(const char *basedir, const std::vector<MDFNSetting> &Driver
dynamic_settings.push_back(setting);
}
if(DriverSettings.size())
MDFN_MergeSettings(DriverSettings);
// First merge all settable settings, then load the settings from the SETTINGS FILE OF DOOOOM
MDFN_MergeSettings(MednafenSettings);
MDFN_MergeSettings(dynamic_settings);
MDFN_MergeSettings(MDFNMP_Settings);
if(DriverSettings.size())
MDFN_MergeSettings(DriverSettings);
for(unsigned int x = 0; x < MDFNSystems.size(); x++)
{
if(MDFNSystems[x]->Settings)