[Scummvm-git-logs] scummvm branch-2-1 -> e2a851b964f5663194fc32c226f7782170bfe229

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e2a851b964 GUI: Fix crash opening edit game dialog for games with no music


Commit: e2a851b964f5663194fc32c226f7782170bfe229
    https://github.com/scummvm/scummvm/commit/e2a851b964f5663194fc32c226f7782170bfe229
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-18T00:16:54+01:00

Commit Message:
GUI: Fix crash opening edit game dialog for games with no music

Changed paths:
    gui/editgamedialog.cpp


diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index b4eae467a0..889bb3ac34 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -343,14 +343,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);