diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-01-12 15:06:05 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-17 11:59:56 -0800 |
| commit | e4450f9123c00a4be970ef3d75bbfee659269b1e (patch) | |
| tree | eaa2063f05e9649efd0a240911c73050fcae861e /xwayland/window-manager.c | |
| parent | d716754cfbe91d885bffc64deff970a7d8b27d44 (diff) | |
| download | weston-e4450f9123c00a4be970ef3d75bbfee659269b1e.tar.gz | |
Fix XWayland crashes when opening popups
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Diffstat (limited to 'xwayland/window-manager.c')
| -rw-r--r-- | xwayland/window-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index d475e360..1bb9825d 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, |