diff options
author | Florian Kagerer | 2010-10-25 14:31:06 +0000 |
---|---|---|
committer | Florian Kagerer | 2010-10-25 14:31:06 +0000 |
commit | 65c7299b38bf1f2e0b3039895f41d1afed647bca (patch) | |
tree | efe7bc079d8a43b5435b8c052fbed5bc571e43ca | |
parent | f4ae774751a82c934203e371b93a144ef1991e7d (diff) | |
download | scummvm-rg350-65c7299b38bf1f2e0b3039895f41d1afed647bca.tar.gz scummvm-rg350-65c7299b38bf1f2e0b3039895f41d1afed647bca.tar.bz2 scummvm-rg350-65c7299b38bf1f2e0b3039895f41d1afed647bca.zip |
GUI/LAUNCHER: follow-up to r53771
The GM and MT-32 popup widgets would be set to the first available MIDI device by default (before any selection has taken place yet). Instead, default will now be the first list entry.
svn-id: r53827
-rw-r--r-- | gui/options.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 40c6e64126..558a89386b 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -213,14 +213,8 @@ void OptionsDialog::open() { } if (_multiMidiCheckbox) { - if (!loadMusicDeviceSetting(_gmDevicePopUp, "gm_device")) { - if (_domain.equals(Common::ConfigManager::kApplicationDomain)) { - if (!loadMusicDeviceSetting(_gmDevicePopUp, Common::String(), MT_GM)) - _gmDevicePopUp->setSelected(0); - } else { - _gmDevicePopUp->setSelected(0); - } - } + if (!loadMusicDeviceSetting(_gmDevicePopUp, "gm_device")) + _gmDevicePopUp->setSelected(0); // Multi midi setting _multiMidiCheckbox->setState(ConfMan.getBool("multi_midi", _domain)); @@ -244,14 +238,8 @@ void OptionsDialog::open() { // MT-32 options if (_mt32DevicePopUp) { - if (!loadMusicDeviceSetting(_mt32DevicePopUp, "mt32_device")) { - if (_domain.equals(Common::ConfigManager::kApplicationDomain)) { - if (!loadMusicDeviceSetting(_mt32DevicePopUp, Common::String(), MT_MT32)) - _mt32DevicePopUp->setSelected(0); - } else { - _mt32DevicePopUp->setSelected(0); - } - } + if (!loadMusicDeviceSetting(_mt32DevicePopUp, "mt32_device")) + _mt32DevicePopUp->setSelected(0); // Native mt32 setting _mt32Checkbox->setState(ConfMan.getBool("native_mt32", _domain)); |