From 518366d567b361b0084f1143085bcf5234c49ac9 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sun, 5 Nov 2023 11:45:07 -0600 Subject: [PATCH] Only toggle keyboardTyping when input key is valid Fixes unintended toggles to virtual keyboard --- src/menus/transient/virtual-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menus/transient/virtual-keyboard.c b/src/menus/transient/virtual-keyboard.c index d09480014..e6449904e 100644 --- a/src/menus/transient/virtual-keyboard.c +++ b/src/menus/transient/virtual-keyboard.c @@ -237,7 +237,7 @@ void M_MenuTypingInput(INT32 key) if (!menutyping.keyboardtyping) // controller inputs { // we pressed a keyboard input that's not any of our buttons - if (M_IsTypingKey(key) && menucmd[pid].dpad_lr == 0 && menucmd[pid].dpad_ud == 0 + if (key >= 0 && M_IsTypingKey(key) && menucmd[pid].dpad_lr == 0 && menucmd[pid].dpad_ud == 0 && !(menucmd[pid].buttons & MBT_A) && !(menucmd[pid].buttons & MBT_B) && !(menucmd[pid].buttons & MBT_C) @@ -252,7 +252,7 @@ void M_MenuTypingInput(INT32 key) else // Keyboard inputs. { // On the flipside, if we're pressing any keyboard input, switch to controller inputs. - if (!M_IsTypingKey(key) && ( + if (key >= 0 && !M_IsTypingKey(key) && ( M_MenuButtonPressed(pid, MBT_A) || M_MenuButtonPressed(pid, MBT_B) || M_MenuButtonPressed(pid, MBT_C)