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

pointer: Don't send leave events to dying surfaces

Browse Source 
It's invalid and will crash the client.
This commit is contained in:
Jasper St. Pierre 2013-11-19 20:20:13 -05:00
parent a8ac2cc275
commit abd368be00
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,8 +303,11 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
struct wl_resource *resource, *kr; struct wl_resource *resource, *kr;
uint32_t serial; uint32_t serial;
if (pointer->focus == surface)
return;
resource = pointer->focus_resource; resource = pointer->focus_resource;
if (resource && pointer->focus != surface) if (resource && pointer->focus->resource)
{ {
struct wl_client *client = wl_resource_get_client (resource); struct wl_client *client = wl_resource_get_client (resource);
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);
@ -313,8 +316,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
} }
resource = find_resource_for_surface (&pointer->resource_list, surface); resource = find_resource_for_surface (&pointer->resource_list, surface);
if (resource && if (resource)
(pointer->focus != surface || pointer->focus_resource != resource))
{ {
struct wl_client *client = wl_resource_get_client (resource); struct wl_client *client = wl_resource_get_client (resource);
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);