From 8320cee1bc3395b68257f4d287b0daa09f283423 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 6 May 2014 01:11:27 -0400 Subject: [PATCH] GameSettingsScreen: Adjust the "Show Touch Pause Menu Button" enabling logic slightly. We don't want it to be enabled in-game, but there's also no point enabling the option if the user isn't showing touch controls to begin with. --- UI/GameSettingsScreen.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 28c1cf165d..d6d464dd77 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -270,7 +270,11 @@ void GameSettingsScreen::CreateViews() { CheckBox *enablePauseBtn = controlsSettings->Add(new CheckBox(&g_Config.bShowTouchPause, c->T("Show Touch Pause Menu Button"))); // Don't allow the user to disable it once in-game, so they can't lock themselves out of the menu. - enablePauseBtn->SetEnabled(!PSP_IsInited()); + if (!PSP_IsInited()) { + enablePauseBtn->SetEnabledPtr(&g_Config.bShowTouchControls); + } else { + enablePauseBtn->SetEnabled(false); + } #endif CheckBox *disableDiags = controlsSettings->Add(new CheckBox(&g_Config.bDisableDpadDiagonals, c->T("Disable D-Pad diagonals (4-way touch)")));