summaryrefslogtreecommitdiffstats
path: root/src/emu/image.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-19 02:46:30 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-19 02:46:30 +1000
commit7978022a9712629f0a96a301092967a0730f9a4f (patch)
treeab3b791db330150b82d054771df6bc7c71f68356 /src/emu/image.cpp
parent8093eb3a543e346dadf0a389c70807c1b2046c34 (diff)
parentc182039d8e96f046eaf8d8f6d071f61d46bf87f4 (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/digfx.h # src/frontend/mame/ui/ui.cpp
Diffstat (limited to 'src/emu/image.cpp')
-rw-r--r--src/emu/image.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/emu/image.cpp b/src/emu/image.cpp
index 7504fa93ff5..3013d03f668 100644
--- a/src/emu/image.cpp
+++ b/src/emu/image.cpp
@@ -196,7 +196,8 @@ void image_manager::options_extract()
// 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() && !image.is_reset_and_loading() && !machine().options().image_option(image.instance_name()).value().empty()))
+ || (!image.exists() && !image.is_reset_and_loading()
+ && machine().options().has_image_option(image.instance_name()) && !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;
@@ -211,7 +212,7 @@ void image_manager::options_extract()
}
// and set the option (provided that it hasn't been removed out from under us)
- if (machine().options().exists(image.instance_name()))
+ if (machine().options().exists(image.instance_name()) && machine().options().has_image_option(image.instance_name()))
machine().options().image_option(image.instance_name()).specify(std::move(image_opt));
}
}