mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonny Lamb
2014-08-06 11:50:12 +02:00
committed by Pekka Paalanen
parent e2f0f84b08
commit e84ab4ef4d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+2 -1
View File
@@ -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_set_position(shsurf->view, shsurf->popup.x, shsurf->popup.y);
weston_view_update_transform(shsurf->view); 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); add_popup_grab(shsurf, shseat);
} else { } else {
shell_surface_send_popup_done(shsurf); shell_surface_send_popup_done(shsurf);