aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-06-27 16:58:06 +0000
committerFlorian Kagerer2010-06-27 16:58:06 +0000
commit72f65f8204d599c1a29a63377accd8d538ef1e88 (patch)
tree8f04ee565b4e9bfa7f66133abcdf3ab3ef923624
parent006197e5bdb7962e3529557f37f269ef6c3bdef0 (diff)
downloadscummvm-rg350-72f65f8204d599c1a29a63377accd8d538ef1e88.tar.gz
scummvm-rg350-72f65f8204d599c1a29a63377accd8d538ef1e88.tar.bz2
scummvm-rg350-72f65f8204d599c1a29a63377accd8d538ef1e88.zip
GUI: fix music device popup (thanks to clone2727 for reporting)
svn-id: r50382
-rw-r--r--gui/options.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 9857d8b8d6..7f132f32f1 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -364,9 +364,15 @@ void OptionsDialog::close() {
}
// Audio options
- saveMusicDeviceSetting(_midiPopUp, "music_driver", musicDeviceSkipSettingDefault);
- saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device", musicDeviceSkipSettingSpec);
- saveMusicDeviceSetting(_gmDevicePopUp, "gm_device", musicDeviceSkipSettingSpec);
+ if (_enableAudioSettings) {
+ saveMusicDeviceSetting(_midiPopUp, "music_driver", musicDeviceSkipSettingDefault);
+ saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device", musicDeviceSkipSettingSpec);
+ saveMusicDeviceSetting(_gmDevicePopUp, "gm_device", musicDeviceSkipSettingSpec);
+ } else {
+ ConfMan.removeKey("music_driver", _domain);
+ ConfMan.removeKey("mt32_device", _domain);
+ ConfMan.removeKey("gm_device", _domain);
+ }
if (_oplPopUp) {
if (_enableAudioSettings) {