From: Axel Davy <axel.davy@ens.fr>
Date: Sun, 12 Jan 2014 14:06:05 +0000 (+0100)
Subject: Fix XWayland crashes when opening popups
X-Git-Tag: upstream/0.1.8~503
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4450f9123c00a4be970ef3d75bbfee659269b1e;p=profile%2Fivi%2Fweston-ivi-shell.git

Fix XWayland crashes when opening popups

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

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 @@ xserver_map_shell_surface(struct weston_wm *wm,
 					      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,