brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-pointer: Fix infinite loop when leaving focus from a destroyed surface

Browse Source 
To prevent corruption, our focus listener needs to be removed even when
the surface is destroyed. So, bailing out when pointer->focus->resource
is NULL just isn't good enough.
This commit is contained in:
Jasper St. Pierre 2014-01-31 18:18:59 -05:00
parent d5d5c2167a
commit 10fead9ba1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wayland/meta-wayland-pointer.c
View File

@ -322,12 +322,16 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
return; return;
resource = pointer->focus_resource; resource = pointer->focus_resource;
if (resource && pointer->focus->resource) if (resource)
{ {
struct wl_client *client = wl_resource_get_client (resource); if (pointer->focus->resource)
struct wl_display *display = wl_client_get_display (client); {
serial = wl_display_next_serial (display); struct wl_client *client = wl_resource_get_client (resource);
wl_pointer_send_leave (resource, serial, pointer->focus->resource); struct wl_display *display = wl_client_get_display (client);
serial = wl_display_next_serial (display);
wl_pointer_send_leave (resource, serial, pointer->focus->resource);
}
wl_list_remove (&pointer->focus_listener.link); wl_list_remove (&pointer->focus_listener.link);
} }