From e4450f9123c00a4be970ef3d75bbfee659269b1e Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Sun, 12 Jan 2014 15:06:05 +0100 Subject: [PATCH] Fix XWayland crashes when opening popups Signed-off-by: Axel Davy --- xwayland/window-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- 2.7.4