summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/image.cpp
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2017-06-26 08:47:48 -0400
committer Vas Crabb <cuavas@users.noreply.github.com>2017-06-27 16:20:45 +1000
commitad3191cdd3cd100bc376fb7daec0ea1508211350 (patch)
treee9c13377033fdfb82c6152b2a6718e87d9744376 /src/emu/image.cpp
parentf05751e2833471af303d58b77212afd75e754c17 (diff)
Fixed issue loading reset_on_load() images (#2414)
Diffstat (limited to 'src/emu/image.cpp')
-rw-r--r--src/emu/image.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/emu/image.cpp b/src/emu/image.cpp
index dc005578883..8d2ccfb5824 100644
--- a/src/emu/image.cpp
+++ b/src/emu/image.cpp
@@ -189,9 +189,12 @@ void image_manager::options_extract()
// is true forces a reset, hence the name)
//
// 2. When is_reset_on_load(), and this results in a device being unmounted (unmounting is_reset_and_load()
- // doesn't force an unmount)
+ // doesn't force an unmount).
+ //
+ // Note that as a part of #2, we cannot extract the option when the image in question is a part of an
+ // active reset_on_load; hence the check for is_reset_and_loading() (see issue #2414)
if (!image.is_reset_on_load()
- || (!image.exists() && !machine().options().image_option(image.instance_name()).value().empty()))
+ || (!image.exists() && !image.is_reset_and_loading() && !machine().options().image_option(image.instance_name()).value().empty()))
{
// we have to assemble the image option differently for software lists and for normal images
std::string image_opt;