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

11 years ago · e84ab4ef4d
parent e2f0f84b08
commit e84ab4ef4d
1 changed files with 2 additions and 1 deletions
--- 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);