commit e4450f9123c00a4be970ef3d75bbfee659269b1e
author Axel Davy <axel.davy@ens.fr> Sun Jan 12 15:06:05 2014 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jan 17 11:59:56 2014 -0800
tree eaa2063f05e9649efd0a240911c73050fcae861e
parent d716754cfbe91d885bffc64deff970a7d8b27d44

Fix XWayland crashes when opening popups

Signed-off-by: Axel Davy <axel.davy@ens.fr>

xwayland/window-manager.c

diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index d475e36..1bb9825 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -2214,7 +2214,7 @@
 					      window->x,
 					      window->y,
 					      WL_SHELL_SURFACE_TRANSIENT_INACTIVE);
-	} else if (window->transient_for) {
+	} else if (window->transient_for && window->transient_for->surface) {
 		parent = window->transient_for;
 		shell_interface->set_transient(window->shsurf,
 					       parent->surface,