summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib
diff options
context:
space:
mode:
author npwoods <npwoods@alumni.cmu.edu>2017-10-06 13:54:10 -0400
committer ajrhacker <ajrhacker@users.noreply.github.com>2017-10-06 13:54:10 -0400
commit3f144b28611d1e5be616511d9fe557a583c5ddbc (patch)
tree154abae995e36e5d04336213480843ae56d335e5 /src/osd/modules/lib
parent6e30c05c88b3a7303dc27be0a879c39d0087bf9d (diff)
Fixed an options overhaul regression (#2530)
This crash (discovered by Wizz) had the following symptoms: 1. Start MAME 2. Choose "Configure Machine" 3. Choose "Video Options" CRASH This was the result of the options editor not having a fully formed list of options where it was expecting one. The fix is to change the declaration of emu_options to one that have full OSD options (it is possible that SDLMAME needs something slightly different) I created a osd_setup_osd_specific_emu_options(emu_options &) function that given an emu_options, will slap on system specific options. I see this as only marginally less gross, and I have zero opinion on whether this should be changed to return an emu_options (rather than have a reference parameter), be a static method on emu_options, or what have you.
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r--src/osd/modules/lib/osdobj_common.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 2c2f750fdbe..f3f1c746337 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -169,7 +169,6 @@ public:
const char *pa_device() const { return value(OSDOPTION_PA_DEVICE); }
const float pa_latency() const { return float_value(OSDOPTION_PA_LATENCY); }
-private:
static const options_entry s_option_entries[];
};