From a18eae10679ed12fb6a37c93cb0b391df874c7c6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 9 Jan 2020 18:36:52 -0800
Subject: GUI: Fix crash opening edit game dialog for games with no music

---
 gui/editgamedialog.cpp | 4 +---
 1 file changed, 1 insertion(+), 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);
-- 
cgit v1.2.3