summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-02-21 12:43:14 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-02-21 12:43:14 +0000
commitbb0f3da064fb75781cf5c9055c3eefa5c8fbcdf9 (patch)
tree2c4efa495f1ff557db3cb0cca0852f14fcc4dc0e
parentdab559f2aa1cbc0a399eff314f564c8aeafe8867 (diff)
Give more proper name and disabled loading of soflist items in open_image_file call (no whatsnew)
-rw-r--r--src/emu/diimage.c6
-rw-r--r--src/emu/diimage.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/diimage.c b/src/emu/diimage.c
index 18f4d3806d5..61fce85a954 100644
--- a/src/emu/diimage.c
+++ b/src/emu/diimage.c
@@ -873,7 +873,7 @@ bool device_image_interface::load_internal(const char *path, bool is_create, int
goto done;
/* Check if there's a software list defined for this device and use that if we're not creating an image */
- if (!filename_has_period)
+ if (!filename_has_period && !just_load)
{
softload = load_software_part( device().machine().options(), this, path, &m_software_info_ptr, &m_software_part_ptr, &m_full_software_name, &m_software_list_name );
// if we had launched from softlist with a specified part, e.g. "shortname:part"
@@ -971,10 +971,10 @@ bool device_image_interface::load(const char *path)
}
/*-------------------------------------------------
- load_for_slot - load an image for slot device
+ open_image_file - opening plain image file
-------------------------------------------------*/
-bool device_image_interface::load_for_slot(emu_options &options)
+bool device_image_interface::open_image_file(emu_options &options)
{
const char* path = options.value(instance_name());
if (strlen(path)>0)
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 16c0783d13c..7c85a7462a5 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -246,7 +246,7 @@ public:
image_device_format *formatlist() const { return m_formatlist; }
bool load(const char *path);
- bool load_for_slot(emu_options &options);
+ bool open_image_file(emu_options &options);
bool finish_load();
void unload();
bool create(const char *path, const image_device_format *create_format, option_resolution *create_args);