Re: [PATCH weston] desktop-shell: don't assume there's a pointer when mapping a popup

2014-08-07 Thread Pekka Paalanen
On Wed, 06 Aug 2014 11:51:26 +0200 Jonny Lamb wrote: > On mer, 2014-08-06 at 11:50 +0200, Jonny Lamb wrote: > > - if (shseat->seat->pointer->grab_serial == shsurf->popup.serial) { > > + if (shseat->seat->pointer && > > + shseat->seat->pointer->grab_serial == shsurf->popup.serial) { > >

Re: [PATCH weston] desktop-shell: don't assume there's a pointer when mapping a popup

2014-08-06 Thread Jonny Lamb
On mer, 2014-08-06 at 11:50 +0200, Jonny Lamb wrote: > - if (shseat->seat->pointer->grab_serial == shsurf->popup.serial) { > + if (shseat->seat->pointer && > + shseat->seat->pointer->grab_serial == shsurf->popup.serial) { This should also be applied to the 1.5 branch (it applies cl

[PATCH weston] desktop-shell: don't assume there's a pointer when mapping a popup

2014-08-06 Thread Jonny Lamb
--- desktop-shell/shell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 3c3649c..5a613f1 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3116,7 +3116,8 @@ shell_map_popup(struct shell_surface *shsurf)