[Scummvm-cvs-logs] SF.net SVN: scummvm:[51330] scummvm/trunk/gui/options.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jul 26 20:41:19 CEST 2010
Revision: 51330
http://scummvm.svn.sourceforge.net/scummvm/?rev=51330&view=rev
Author: lordhoto
Date: 2010-07-26 18:41:19 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
GUI: Fix regression from r51265.
This makes the GMM's option dialog work again.
The fix itself is exactly the same like I made in r50468, which
also broke the GMM's option dialog.
Modified Paths:
--------------
scummvm/trunk/gui/options.cpp
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-07-26 18:40:49 UTC (rev 51329)
+++ scummvm/trunk/gui/options.cpp 2010-07-26 18:41:19 UTC (rev 51330)
@@ -409,14 +409,16 @@
}
// MT-32 options
- if (_enableMT32Settings) {
- saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device");
- ConfMan.setBool("native_mt32", _mt32Checkbox->getState(), _domain);
- ConfMan.setBool("enable_gs", _enableGSCheckbox->getState(), _domain);
- } else {
- ConfMan.removeKey("mt32_device", _domain);
- ConfMan.removeKey("native_mt32", _domain);
- ConfMan.removeKey("enable_gs", _domain);
+ if (_mt32DevicePopUp) {
+ if (_enableMT32Settings) {
+ saveMusicDeviceSetting(_mt32DevicePopUp, "mt32_device");
+ ConfMan.setBool("native_mt32", _mt32Checkbox->getState(), _domain);
+ ConfMan.setBool("enable_gs", _enableGSCheckbox->getState(), _domain);
+ } else {
+ ConfMan.removeKey("mt32_device", _domain);
+ ConfMan.removeKey("native_mt32", _domain);
+ ConfMan.removeKey("enable_gs", _domain);
+ }
}
// Subtitle options
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list