diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-08-06 11:50:12 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-08-07 16:24:36 +0300 |
| commit | d258e0c3f4d57222e2b5d3acb6492836e0a1dc47 (patch) | |
| tree | 1b843376335b543fb00ccdfdd37a3c0fe0376d07 | |
| parent | 494b14b64a230e4319bdcad64e494b381e6400a9 (diff) | |
| download | weston-1.5.tar.gz | |
desktop-shell: don't assume there's a pointer when mapping a popup1.5
| -rw-r--r-- | desktop-shell/shell.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index d965618a..584dd6ae 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -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); |