From be2cb0006644cb17cafca449f2d69c989e18ed2f Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Tue, 11 Oct 2022 11:16:52 -0400 Subject: [PATCH] wayland: Check for the input handle before checking the keyboard handle --- src/video/wayland/SDL_waylandkeyboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video/wayland/SDL_waylandkeyboard.c b/src/video/wayland/SDL_waylandkeyboard.c index 8fcf67857..6f6115d22 100644 --- a/src/video/wayland/SDL_waylandkeyboard.c +++ b/src/video/wayland/SDL_waylandkeyboard.c @@ -145,8 +145,9 @@ Wayland_HasScreenKeyboardSupport(_THIS) * input protocol, make sure we don't have any physical keyboards either. */ SDL_VideoData *driverdata = _this->driverdata; - return (driverdata->input->keyboard == NULL && - driverdata->text_input_manager != NULL); + SDL_bool haskeyboard = (driverdata->input != NULL) && (driverdata->input->keyboard != NULL); + SDL_bool hastextmanager = (driverdata->text_input_manager != NULL); + return (!haskeyboard && hastextmanager); } #endif /* SDL_VIDEO_DRIVER_WAYLAND */