mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shell: clear popup grab interface on remove_popup_grab and popup_grab_end 

Fixes a segfault. Steps to reproduce:

* start weston with the x11 backend
* open a terminal
* click on the icon in the top left corner, choose close
* close the x11 window containing weston
This commit is contained in:
Philipp Brüschweiler 2013-04-15 21:09:54 +02:00 committed by Kristian Høgsberg
parent 96386b8e5e
commit 63e7be60b3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell.c
View File

@ -1986,6 +1986,8 @@ popup_grab_end(struct wl_pointer *pointer)
if (pointer->grab->interface == &popup_grab_interface) {
wl_pointer_end_grab(grab->pointer);
shseat->popup_grab.client = NULL;
shseat->popup_grab.grab.interface = NULL;
assert(!wl_list_empty(&shseat->popup_grab.surfaces_list));
/* Send the popup_done event to all the popups open */
wl_list_for_each(shsurf, &shseat->popup_grab.surfaces_list, popup.grab_link) {
wl_shell_surface_send_popup_done(&shsurf->resource);
@ -2028,6 +2030,7 @@ remove_popup_grab(struct shell_surface *shsurf)
wl_list_init(&shsurf->popup.grab_link);
if (wl_list_empty(&shseat->popup_grab.surfaces_list)) {
wl_pointer_end_grab(shseat->popup_grab.grab.pointer);
shseat->popup_grab.grab.interface = NULL;
}
}