From e11110400a0928e811ba02e128c3ca1567aca710 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 14 Aug 2025 13:41:40 -0700 Subject: [PATCH] Fixed crash when reinitializing video on X11 The keyboard keymap was left pointing at a freed keymap after X11_QuitKeyboard() --- src/video/x11/SDL_x11keyboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c index 247d8e0a84..d26087a12f 100644 --- a/src/video/x11/SDL_x11keyboard.c +++ b/src/video/x11/SDL_x11keyboard.c @@ -515,6 +515,7 @@ void X11_QuitKeyboard(SDL_VideoDevice *_this) #ifdef SDL_VIDEO_DRIVER_X11_HAS_XKBLIB if (data->keyboard.xkb_enabled) { + SDL_SetKeymap(NULL, false); for (int i = 0; i < XkbNumKbdGroups; ++i) { SDL_DestroyKeymap(data->keyboard.xkb.keymaps[i]); data->keyboard.xkb.keymaps[i] = NULL;