[PATCH weston] desktop-shell: don't assume there's a pointer when mapping a popup

Jonny Lamb jonny.lamb at collabora.co.uk
Wed Aug 6 02:50:12 PDT 2014


---
 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 3c3649c..5a613f1 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3116,7 +3116,8 @@ shell_map_popup(struct shell_surface *shsurf)
 	weston_view_set_position(shsurf->view, shsurf->popup.x, shsurf->popup.y);
 	weston_view_update_transform(shsurf->view);
 
-	if (shseat->seat->pointer->grab_serial == shsurf->popup.serial) {
+	if (shseat->seat->pointer &&
+	    shseat->seat->pointer->grab_serial == shsurf->popup.serial) {
 		add_popup_grab(shsurf, shseat);
 	} else {
 		shell_surface_send_popup_done(shsurf);
-- 
2.0.1



More information about the wayland-devel mailing list