[Scummvm-cvs-logs] SF.net SVN: scummvm:[50382] scummvm/trunk/gui/options.cpp

[athrxx at users.sourceforge.net]

Revision: 50382
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50382&view=rev
Author:   athrxx
Date:     2010-06-27 16:58:06 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
GUI: fix music device popup (thanks to clone2727 for reporting)

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-06-27 16:53:08 UTC (rev 50381)
+++ scummvm/trunk/gui/options.cpp	2010-06-27 16:58:06 UTC (rev 50382)
@@ -364,9 +364,15 @@
 		}
 
 		// 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.