Fix problem with confirm button set to O.

Fixes #21042
This commit is contained in:
Henrik Rydgård committed 2026-02-13 22:08:28 +01:00
1 parent fa46bc25e7
commit 7fa52a0916
4 files changed
+40 -62

No files matched your search

+4 -3
View File
@@ -164,8 +164,6 @@ GameSettingsScreen::~GameSettingsScreen() {
System_Notify(SystemNotification::UI);
KeyMap::UpdateNativeMenuKeys();
// Wipe some caches after potentially changing settings.
// Let's not send resize messages here, handled elsewhere.
System_PostUIMessage(UIMessage::GPU_CONFIG_CHANGED);
@@ -1466,7 +1464,10 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
static const char *timeFormat[] = { "24HR", "12HR" };
systemSettings->Add(new PopupMultiChoice(&g_Config.iTimeFormat, sy->T("Time Format"), timeFormat, 0, ARRAY_SIZE(timeFormat), I18NCat::SYSTEM, screenManager()));
static const char *buttonPref[] = { "Use O to confirm", "Use X to confirm" };
systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, sy->T("Confirmation Button"), buttonPref, 0, ARRAY_SIZE(buttonPref), I18NCat::SYSTEM, screenManager()));
PopupMultiChoice *buttonPrefChoice = systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, sy->T("Confirmation Button"), buttonPref, 0, ARRAY_SIZE(buttonPref), I18NCat::SYSTEM, screenManager()));
buttonPrefChoice->OnChoice.Add([](UI::EventParams &e) {
KeyMap::UpdateNativeMenuKeys();
});
#if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE))
systemSettings->Add(new ItemHeader(sy->T("Recording")));