commit 81cadc725cbfeef2cd60574cf6859be595965873
author Kristian Høgsberg <krh@bitplanet.net> Tue Sep 03 16:15:42 2013 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Tue Sep 03 20:57:18 2013 -0700
tree 836be5e1c944f15a3a12b9abfea654d9fc105b00
parent 1a7a57f0d959192b14237cd5051f8cdde2a2d39f

xwm: Set window->surface to NULL when surface goes away

Otherwise we may end up trying to remove the destroy listener if we
get the surface_destroy callback before the unmap_notify.

src/xwayland/window-manager.c

diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index 5258197..c6c7bd5 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -1847,6 +1847,8 @@
 			     struct weston_wm_window, surface_destroy_listener);
 
 	wm_log("surface for xid %d destroyed\n", window->id);
+
+	window->surface = NULL;
 }
 
 static struct weston_wm_window *