shell: Don't assign keyboard focus for seats without keyboard
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 17 Jan 2014 20:18:53 +0000 (12:18 -0800)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 17 Jan 2014 20:19:06 +0000 (12:19 -0800)
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73570

desktop-shell/shell.c

index 79e6518..137ec7a 100644 (file)
@@ -665,6 +665,9 @@ restore_focus_state(struct desktop_shell *shell, struct workspace *ws)
        struct weston_surface *surface;
 
        wl_list_for_each_safe(state, next, &ws->focus_list, link) {
+               if (state->seat->keyboard == NULL)
+                       continue;
+
                surface = state->keyboard_focus;
 
                weston_keyboard_set_focus(state->seat->keyboard, surface);