mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SDL: Fix a XWayland crash when capturing keyboard input

Browse source
This commit is contained in:
Sepalani 2025-07-11 17:10:47 +04:00
commit 9c210aa223
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View file

@ -369,6 +369,17 @@ bool InputBackend::HandleEventAndContinue(const SDL_Event& e)
} }
else if (e.type == Common::KeyboardContext::s_sdl_init_event_type) else if (e.type == Common::KeyboardContext::s_sdl_init_event_type)
{ {
const auto wsi = GetControllerInterface().GetWindowSystemInfo();
if (wsi.type == WindowSystemType::X11)
{
// Avoid a crash with Xwayland when the wrong driver is picked
if (!SDL_SetHint(SDL_HINT_VIDEO_DRIVER, "x11"))
{
WARN_LOG_FMT(IOS_USB, "SDL failed to pick driver to capture keyboard input: {}",
SDL_GetError());
}
}
if (!SDL_InitSubSystem(SDL_INIT_VIDEO)) if (!SDL_InitSubSystem(SDL_INIT_VIDEO))
{ {
ERROR_LOG_FMT(IOS_USB, "SDL failed to init subsystem to capture keyboard input: {}", ERROR_LOG_FMT(IOS_USB, "SDL failed to init subsystem to capture keyboard input: {}",