Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 05:08:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Placed flag removal on machine destructor, fixes issue from r9779 (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2010-07-21 16:23:27 +00:00
parent 270627e1b9
commit 2b81a7d1fe
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine.c
View File

@ -225,6 +225,8 @@ running_machine::running_machine(const game_driver &driver, const machine_config
running_machine::~running_machine() running_machine::~running_machine()
{ {
/* clear flag for added devices */
options_set_bool(&m_options, OPTION_ADDED_DEVICE_OPTIONS, FALSE, OPTION_PRIORITY_CMDLINE);
} }

4
src/emu/mame.c
View File

@ -565,16 +565,12 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
if (filerr != FILERR_NONE) if (filerr != FILERR_NONE)
return FALSE; return FALSE;
/* clear flag for added devices */
options_set_bool(options, OPTION_ADDED_DEVICE_OPTIONS, FALSE, OPTION_PRIORITY_CMDLINE);
/* update game name so depending callback options could be added */ /* update game name so depending callback options could be added */
if (priority==OPTION_PRIORITY_DRIVER_INI) { if (priority==OPTION_PRIORITY_DRIVER_INI) {
options_force_option_callback(options, OPTION_GAMENAME, name, priority); options_force_option_callback(options, OPTION_GAMENAME, name, priority);
} }
/* parse the file and close it */ /* parse the file and close it */
mame_printf_verbose("Parsing %s.ini\n", name);
options_parse_ini_file(options, mame_core_file(file), priority); options_parse_ini_file(options, mame_core_file(file), priority);
mame_fclose(file); mame_fclose(file);
return TRUE; return TRUE;