[Scummvm-git-logs] scummvm master -> b469747f7a756d53c2d8dfb61ff426e62f7ca5b1

[bluegr]

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:
b469747f7a GUI: Don't show midi setting tabs if the game has no music at all.


Commit: b469747f7a756d53c2d8dfb61ff426e62f7ca5b1
    https://github.com/scummvm/scummvm/commit/b469747f7a756d53c2d8dfb61ff426e62f7ca5b1
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2019-12-07T21:14:44+02:00

Commit Message:
GUI: Don't show midi setting tabs if the game has no music at all.

Changed paths:
    gui/editgamedialog.cpp


diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 1b34a47..c2953dc 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -223,11 +223,13 @@ EditGameDialog::EditGameDialog(const String &domain)
 
 	addVolumeControls(tab, "GameOptions_Volume.");
 
+	bool showMidi = !_guioptions.contains(GUIO_NOMIDI) && !_guioptions.contains(GUIO_NOMUSIC);
+
 	//
 	// 6) The MIDI tab
 	//
 	_globalMIDIOverride = NULL;
-	if (!_guioptions.contains(GUIO_NOMIDI)) {
+	if (showMidi) {
 		tab->addTab(_("MIDI"));
 
 		if (g_system->getOverlayWidth() > 320)
@@ -242,7 +244,7 @@ EditGameDialog::EditGameDialog(const String &domain)
 	// 7) The MT-32 tab
 	//
 	_globalMT32Override = NULL;
-	if (!_guioptions.contains(GUIO_NOMIDI)) {
+	if (showMidi) {
 		tab->addTab(_("MT-32"));
 
 		if (g_system->getOverlayWidth() > 320)