Commit be2cb0006644cb17cafca449f2d69c989e18ed2f

Ethan Lee 2022-10-11T11:16:52

wayland: Check for the input handle before checking the keyboard handle

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/src/video/wayland/SDL_waylandkeyboard.c b/src/video/wayland/SDL_waylandkeyboard.c
index 8fcf678..6f6115d 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 */