From aa85fc37872b0ca5867ad8fa3e969dc8755c3351 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 4 Mar 2024 18:13:18 +0100 Subject: [PATCH] dont use it for control setup --- src/m_menu.c | 1 + src/sdl/i_video.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index fe0983d01..c5a53b115 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3858,6 +3858,7 @@ boolean M_Responder(event_t *ev) case KEY_BACKSPACE: if ((currentMenu->menuitems[itemOn].status) == IT_CONTROL) { + menu_text_input = false; //never use native layout for control setup // detach any keys associated with the game control G_ClearControlKeys(setupcontrols, currentMenu->menuitems[itemOn].alphaKey); S_StartSound(NULL, sfx_shldls); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index c6ef6b032..e21ab4e1a 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -865,7 +865,7 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type) return; } - if (cv_nativekeyboard.value && (chat_on || CON_Ready() || menu_text_input)) //only use this this if on chat or console + if (cv_nativekeyboard.value && (chat_on || CON_Ready() || (menu_text_input && menuactive))) //only use this this if on chat or console or the current menu wants inputs from us (except if its the control setup menu ig) event.data1 = GetTypedChar(evt.keysym.scancode, &evt.keysym); else event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);