aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorJohannes Schickel2010-07-26 18:41:19 +0000
committerJohannes Schickel2010-07-26 18:41:19 +0000
commit9be3c6943810a9a2a15a3acf42f18df661be5eee (patch)
treefcbaa3d64a5271afd7f94fcc777087d667cb0700 /gui
parent4940819df6d7eee7a5b6b1ebcc08e8ac35ad0268 (diff)
downloadscummvm-rg350-9be3c6943810a9a2a15a3acf42f18df661be5eee.tar.gz
scummvm-rg350-9be3c6943810a9a2a15a3acf42f18df661be5eee.tar.bz2
scummvm-rg350-9be3c6943810a9a2a15a3acf42f18df661be5eee.zip
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. svn-id: r51330
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 8ddd263a46..d3bda228a7 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -409,14 +409,16 @@ void OptionsDialog::close() {
}
// 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