[mutter/wayland] pointer: Fix crash when we have the pointer over nothing during a popup grab



commit 594b15abf17625caebf1df3f275992c02b866b57
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Nov 19 18:48:18 2013 -0500

    pointer: Fix crash when we have the pointer over nothing during a popup grab

 src/wayland/meta-wayland-pointer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index 37748f1..04b464b 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]