Merge pull request #6036 from thedax/gameSettingsScreen-ui-fix

GameSettingsScreen: Adjust the "Show Touch Pause Menu Button" enabling logic slightly.
This commit is contained in:
Henrik Rydgård 2014-05-08 13:34:03 +02:00
commit d3ab35673b

View file

@ -271,7 +271,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)")));