summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2016-09-01 20:05:13 -0400
committer Nathan Woods <npwoods@mess.org>2016-09-01 20:05:13 -0400
commit2c9e00b96d89b78203c0b11b7bdcfd28f3792d96 (patch)
tree661f43ccd5b1e0c58aa1b12051b3323119f2c297
parent9c06ec0b6a8c8b3cdc0a84f5cbc296747910c058 (diff)
Moving null_option_guide to global scope to avoid thread safety issues
-rw-r--r--src/emu/diimage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index 6602ba199a2..e8513226415 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -1227,9 +1227,10 @@ void device_image_interface::unload()
// create_option_guide
//-------------------------------------------------
+static const util::option_guide null_option_guide = {};
+
const util::option_guide &device_image_interface::create_option_guide() const
{
- static const util::option_guide null_option_guide = {};
return null_option_guide;
}