diff options
| author | lubomyr | 2017-01-31 20:36:54 +0200 |
|---|---|---|
| committer | lubomyr | 2017-01-31 20:36:54 +0200 |
| commit | 2aa0cdcff67bf423fd7eb5ed8b50749930d32a0f (patch) | |
| tree | ba11d7038347a56c113b2b764049025f4a18dbf3 | |
| parent | 15acee29f19c845dc534d2c8af48a449ea1cd380 (diff) | |
| download | scummvm-rg350-2aa0cdcff67bf423fd7eb5ed8b50749930d32a0f.tar.gz scummvm-rg350-2aa0cdcff67bf423fd7eb5ed8b50749930d32a0f.tar.bz2 scummvm-rg350-2aa0cdcff67bf423fd7eb5ed8b50749930d32a0f.zip | |
ANDROIDSDL: fixed in-game menu crash, removed unused method
| -rw-r--r-- | gui/options.cpp | 7 | ||||
| -rw-r--r-- | gui/options.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index ffce01fc1e..30ca132516 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -211,7 +211,8 @@ void OptionsDialog::build() { // AndroidSDL options if (ConfMan.hasKey("touchpad_mouse_mode", _domain)) { bool touchpadState = ConfMan.getBool("touchpad_mouse_mode", _domain); - _touchpadCheckbox->setState(touchpadState); + if (_touchpadCheckbox != 0) + _touchpadCheckbox->setState(touchpadState); } #endif @@ -693,10 +694,6 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data } } -void OptionsDialog::setAndroidSdlSettingsState(bool enabled) { - _enableAndroidSdlSettings = enabled; -} - void OptionsDialog::setGraphicSettingsState(bool enabled) { _enableGraphicSettings = enabled; diff --git a/gui/options.h b/gui/options.h index e6bb195b41..046e9acf6d 100644 --- a/gui/options.h +++ b/gui/options.h @@ -99,9 +99,6 @@ protected: void addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal = 255); void addEngineControls(GuiObject *boss, const Common::String &prefix, const ExtraGuiOptions &engineOptions); -#ifdef ANDROIDSDL - void setAndroidSdlSettingsState(bool enabled); -#endif void setGraphicSettingsState(bool enabled); void setAudioSettingsState(bool enabled); void setMIDISettingsState(bool enabled); |