mirror of
https://github.com/holub/mame
synced 2025-05-20 04:39:11 +03:00
Placed flag removal on machine destructor, fixes issue from r9779 (no whatsnew)
This commit is contained in:
parent
270627e1b9
commit
2b81a7d1fe
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -564,9 +564,6 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
|
|||||||
filerr = mame_fopen_options(options, SEARCHPATH_INI, fname, OPEN_FLAG_READ, &file);
|
filerr = mame_fopen_options(options, SEARCHPATH_INI, fname, OPEN_FLAG_READ, &file);
|
||||||
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) {
|
||||||
@ -574,7 +571,6 @@ static int parse_ini_file(core_options *options, const char *name, int 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;
|
||||||
|
Loading…
Reference in New Issue
Block a user