summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-11-10 08:29:37 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-11-10 08:29:37 +0000
commit3e42c687e8e5b91e0776092a09d2c39c015f9954 (patch)
treea68e79ef3fd0fb0e8426d8ec1e746d4ddce2ce9d /src
parent734aa1782a26e78fef213d66b55b7be95bde1159 (diff)
Fixed loading software with unadorned parameter (no whatsnew)
Diffstat (limited to 'src')
-rw-r--r--src/emu/clifront.c2
-rw-r--r--src/emu/emuopts.c9
2 files changed, 4 insertions, 7 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index fa013336b95..6abb34c92d9 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -218,7 +218,7 @@ int cli_frontend::execute(int argc, char **argv)
// mount only if not already mounted
if (strlen(option)==0) {
astring val;
- val.printf("%s:%s",m_options.software_name(),swpart->name);
+ val.printf("%s:%s:%s",swlist->list_name[i],m_options.software_name(),swpart->name);
// call this in order to set slot devices according to mounting
m_options.parse_slot_devices(argc, argv, option_errors, image->instance_name(), val.cstr());
}
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index 87d781589cf..d13a31132cc 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -337,19 +337,16 @@ void emu_options::remove_device_options()
bool emu_options::parse_slot_devices(int argc, char *argv[], astring &error_string, const char *name, const char *value)
{
remove_device_options();
- if (name && exists(name)) {
- set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string);
- }
bool isfirst = true;
bool result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string);
while (add_slot_options(isfirst)) {
result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string);
- if (name && exists(name)) {
- set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string);
- }
isfirst = false;
}
add_device_options(true);
+ if (name && exists(name)) {
+ set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string);
+ }
result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string);
return result;
}