projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2f0f84
)
desktop-shell: don't assume there's a pointer when mapping a popup
author
Jonny Lamb
<jonny.lamb@collabora.co.uk>
Wed, 6 Aug 2014 09:50:12 +0000
(11:50 +0200)
committer
Pekka Paalanen
<pekka.paalanen@collabora.co.uk>
Thu, 7 Aug 2014 13:23:10 +0000
(16:23 +0300)
desktop-shell/shell.c
patch
|
blob
|
history
diff --git
a/desktop-shell/shell.c
b/desktop-shell/shell.c
index
3c3649c
..
5a613f1
100644
(file)
--- 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);