Commit be34036ed7b6ec9c507395831b2ec7b0554187e6

Philipp Wiesemann 2016-03-02T20:25:23

Wayland: Fixed fault in event handling which might have caused a crash someday. Found by Cppcheck.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 53b0ac9..8a645c4 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -302,9 +302,9 @@ keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
  
     window = wl_surface_get_user_data(surface);
 
-    input->keyboard_focus = window;
-    window->keyboard_device = input;
     if (window) {
+        input->keyboard_focus = window;
+        window->keyboard_device = input;
         SDL_SetKeyboardFocus(window->sdlwindow);
     }
 }