shell: End grab if the grabbed shell surface has been destroyed

The shell_grab_start function sets up a destroy notification on the
shell surface such that when the shell surface is destroyed the pointer
on the grab to the shell surface is set to NULL.

We must therefore check whether the shell surface is NULL and end the
grab if it is.

https://bugs.freedesktop.org/show_bug.cgi?id=64689
Rob Bradford 12 years ago committed by Kristian Høgsberg
parent 419e2bae92
commit 2f8d9aacfa
  1. 2
      src/shell.c

@ -1296,7 +1296,7 @@ busy_cursor_grab_focus(struct weston_pointer_grab *base)
pointer->x, pointer->y, pointer->x, pointer->y,
&sx, &sy); &sx, &sy);
if (grab->shsurf->surface != surface) { if (!grab->shsurf || grab->shsurf->surface != surface) {
shell_grab_end(grab); shell_grab_end(grab);
free(grab); free(grab);
} }

Loading…
Cancel
Save