From 9be3c6943810a9a2a15a3acf42f18df661be5eee Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 26 Jul 2010 18:41:19 +0000 Subject: [PATCH] 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 --- gui/options.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gui/options.cpp b/gui/options.cpp index 8ddd263a460..d3bda228a78 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