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

pointer/keyboard: Fix segfault once more

Browse Source 
If the resource is destroyed before the surface, then we'll kill
ourselves. Why can I never seem to write these correctly...
This commit is contained in:
Jasper St. Pierre 2014-02-23 09:59:42 -05:00
parent 337c69e223
commit ff8c4b1bcf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/meta-wayland-keyboard.c
View File

@ -225,8 +225,11 @@ keyboard_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
wl_list_remove (&keyboard->focus_surface_listener.link); wl_list_remove (&keyboard->focus_surface_listener.link);
keyboard->focus_surface = NULL; keyboard->focus_surface = NULL;
if (keyboard->focus_resource)
{
wl_list_remove (&keyboard->focus_resource_listener.link); wl_list_remove (&keyboard->focus_resource_listener.link);
keyboard->focus_resource = NULL; keyboard->focus_resource = NULL;
}
} }
static void static void

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

@ -63,8 +63,11 @@ pointer_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
wl_list_remove (&pointer->focus_surface_listener.link); wl_list_remove (&pointer->focus_surface_listener.link);
pointer->focus_surface = NULL; pointer->focus_surface = NULL;
if (pointer->focus_resource)
{
wl_list_remove (&pointer->focus_resource_listener.link); wl_list_remove (&pointer->focus_resource_listener.link);
pointer->focus_resource = NULL; pointer->focus_resource = NULL;
}
} }
static void static void