From 72f65f8204d599c1a29a63377accd8d538ef1e88 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sun, 27 Jun 2010 16:58:06 +0000
Subject: GUI: fix music device popup (thanks to clone2727 for reporting)
svn-id: r50382
---
gui/options.cpp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'gui')
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) {
--
cgit v1.2.3