aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2020-01-09 18:36:52 -0800
committerPaul Gilbert2020-01-09 18:37:19 -0800
commita18eae10679ed12fb6a37c93cb0b391df874c7c6 (patch)
tree5b223b69ccd1bbbe97a560a10a007efb442d064b
parente0a3a387b986ced784b9635244d29b924f830863 (diff)
downloadscummvm-rg350-a18eae10679ed12fb6a37c93cb0b391df874c7c6.tar.gz
scummvm-rg350-a18eae10679ed12fb6a37c93cb0b391df874c7c6.tar.bz2
scummvm-rg350-a18eae10679ed12fb6a37c93cb0b391df874c7c6.zip
GUI: Fix crash opening edit game dialog for games with no music
-rw-r--r--gui/editgamedialog.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 60feac15d6..449bcc542f 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -341,14 +341,12 @@ void EditGameDialog::open() {
ConfMan.hasKey("speech_volume", _domain);
_globalVolumeOverride->setState(e);
- if (!_guioptions.contains(GUIO_NOMIDI)) {
+ if (!_guioptions.contains(GUIO_NOMIDI) && !_guioptions.contains(GUIO_NOMUSIC)) {
e = ConfMan.hasKey("soundfont", _domain) ||
ConfMan.hasKey("multi_midi", _domain) ||
ConfMan.hasKey("midi_gain", _domain);
_globalMIDIOverride->setState(e);
- }
- if (!_guioptions.contains(GUIO_NOMIDI)) {
e = ConfMan.hasKey("native_mt32", _domain) ||
ConfMan.hasKey("enable_gs", _domain);
_globalMT32Override->setState(e);