From: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: Wed, 6 Aug 2014 09:50:12 +0000 (+0200)
Subject: desktop-shell: don't assume there's a pointer when mapping a popup
X-Git-Tag: 1.5.91~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e84ab4ef4dda6169cae3eb5a35a1200b7840c55b;p=platform%2Fupstream%2Fweston.git

desktop-shell: don't assume there's a pointer when mapping a popup
---

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);