From 7e431bd6bc5ffe4c9afacb842429b9af1185b678 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 8 Oct 2014 12:36:13 -0700 Subject: [PATCH] Revert "pointer: Repick after the focused surface is destroyed" This reverts commit e496ed50d6b127a57cfc189bad19a32564fde46b. This was incorrect. wl_surface_destructor actually does the full repick -- doing it here is dangerous, because the destroy listeners actually run *before* the destructor, not after, so the surface is still alive. --- src/wayland/meta-wayland-pointer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 63a03744c..448d223dc 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -96,7 +96,7 @@ pointer_handle_focus_surface_destroy (struct wl_listener *listener, void *data) { MetaWaylandPointer *pointer = wl_container_of (listener, pointer, focus_surface_listener); - meta_wayland_pointer_repick (pointer); + meta_wayland_pointer_set_focus (pointer, NULL); } static void