[PATCH weston] desktop-shell: Don't assume there is a pointer when resizing

Emilio Pozuelo Monfort pochu27 at gmail.com
Wed Jun 18 08:48:58 PDT 2014


From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>

Fixes a crash on touch devices without a pointer, when touching
the window frame of a client.

Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
---
 desktop-shell/shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 84f5c83..d965618 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1784,7 +1784,8 @@ common_surface_resize(struct wl_resource *resource,
 	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
 	struct weston_surface *surface;
 
-	if (seat->pointer->button_count == 0 ||
+	if (seat->pointer == NULL ||
+	    seat->pointer->button_count == 0 ||
 	    seat->pointer->grab_serial != serial ||
 	    seat->pointer->focus == NULL)
 		return;
-- 
2.0.0



More information about the wayland-devel mailing list