Fix XWayland crashes when opening popups
authorAxel Davy <axel.davy@ens.fr>
Sun, 12 Jan 2014 14:06:05 +0000 (15:06 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 17 Jan 2014 19:59:56 +0000 (11:59 -0800)
Signed-off-by: Axel Davy <axel.davy@ens.fr>
xwayland/window-manager.c

index d475e36..1bb9825 100644 (file)
@@ -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,