diff options
| -rw-r--r-- | desktop-shell/shell.c | 6 | ||||
| -rw-r--r-- | src/input.c | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index bf52b93c..ad6750d3 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4444,10 +4444,14 @@ fullscreen_binding(struct weston_seat *seat, uint32_t time, uint32_t button, voi static void touch_move_binding(struct weston_seat *seat, uint32_t time, void *data) { - struct weston_surface *focus = seat->touch->focus->surface; + struct weston_surface *focus; struct weston_surface *surface; struct shell_surface *shsurf; + if (seat->touch->focus == NULL) + return; + + focus = seat->touch->focus->surface; surface = weston_surface_get_main_surface(focus); if (surface == NULL) return; diff --git a/src/input.c b/src/input.c index d03333a6..5e82f5dd 100644 --- a/src/input.c +++ b/src/input.c @@ -1471,8 +1471,14 @@ weston_touch_set_focus(struct weston_seat *seat, struct weston_view *view) } if (view) { - struct wl_client *surface_client = - wl_resource_get_client(view->surface->resource); + struct wl_client *surface_client; + + if (!view->surface->resource) { + seat->touch->focus = NULL; + return; + } + + surface_client = wl_resource_get_client(view->surface->resource); move_resources_for_client(focus_resource_list, &seat->touch->resource_list, surface_client); |