From 594b15abf17625caebf1df3f275992c02b866b57 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 19 Nov 2013 18:48:18 -0500 Subject: [PATCH] pointer: Fix crash when we have the pointer over nothing during a popup grab --- src/wayland/meta-wayland-pointer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 37748f129..04b464bf1 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -488,7 +488,7 @@ popup_grab_focus (MetaWaylandPointerGrab *grab, /* Popup grabs are in owner-events mode (ie, events for the same client are reported as normal) */ - if (wl_resource_get_client (surface->resource) == popup_grab->grab_client) + if (surface && wl_resource_get_client (surface->resource) == popup_grab->grab_client) default_grab_focus (grab, surface, event); else meta_wayland_pointer_set_focus (grab->pointer, NULL);