From 8a0691813194736219bed2fe3fc03e5717e57cb5 Mon Sep 17 00:00:00 2001 From: mahlemiut Date: Tue, 3 Jun 2014 07:12:54 +0000 Subject: revert r30583, it breaks -ramsize option (no whatsnew) --- src/emu/emuopts.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/emu/emuopts.c') diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 72c1098a06e..6d59d276928 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -380,12 +380,14 @@ bool emu_options::parse_command_line(int argc, char *argv[], astring &error_stri bool result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); // if the system name changed, fix up the device options - // remove any existing device options - if (old_system_name != system_name()) remove_device_options(); - - result = parse_slot_devices(argc, argv, error_string, NULL, NULL); - if (exists(OPTION_RAMSIZE) && old_system_name.len()!=0) - set_value(OPTION_RAMSIZE, "", OPTION_PRIORITY_CMDLINE, error_string); + if (old_system_name != system_name()) + { + // remove any existing device options + remove_device_options(); + result = parse_slot_devices(argc, argv, error_string, NULL, NULL); + if (exists(OPTION_RAMSIZE) && old_system_name.len()!=0) + set_value(OPTION_RAMSIZE, "", OPTION_PRIORITY_CMDLINE, error_string); + } return result; } -- cgit v1.2.3-70-g09d2