summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2017-06-29 19:37:03 -0400
committer Vas Crabb <cuavas@users.noreply.github.com>2017-06-30 10:09:05 +1000
commitd7e81e1e57702357e93d390a15f639621652aee7 (patch)
tree8fdbf1762fdaf523b4dc87b85156e4977982c0a0
parenteb74b1b2a985364ba1053fb574e3632ed187be8e (diff)
Fixed sorcerer unmount issue reported by Robert
Report from Robert: Start mame sorcerer, then enter the slots menu, empty the rs232 slot, then choose Reset. It crashes with an access violation.
-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 8d2ccfb5824..cd7329b13ef 100644
--- a/src/emu/image.cpp
+++ b/src/emu/image.cpp
@@ -206,8 +206,9 @@ void image_manager::options_extract()
image_opt = image.filename();
}
- // and set the option
- machine().options().image_option(image.instance_name()).specify(std::move(image_opt));
+ // and set the option (provided that it hasn't been removed out from under us)
+ if (machine().options().exists(image.instance_name()))
+ machine().options().image_option(image.instance_name()).specify(std::move(image_opt));
}
}