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

This commit is contained in:
Jonny Lamb 2014-08-06 11:50:12 +02:00 committed by Pekka Paalanen
parent 494b14b64a
commit d258e0c3f4
1 changed files with 2 additions and 1 deletions

View File

@ -3091,7 +3091,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);