diff options
| author | Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> | 2014-01-29 21:16:05 +0900 |
|---|---|---|
| committer | Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> | 2014-01-29 21:16:05 +0900 |
| commit | ef9195febc0e67a116b2f1d093cbcbeb629c92b4 (patch) | |
| tree | cd78faf6ac50b0d4e726009843b84b320e210570 /xwayland/window-manager.c | |
| parent | b5db437f0d89404936c654e43f0fce8c4d1e7715 (diff) | |
| download | weston-ef9195febc0e67a116b2f1d093cbcbeb629c92b4.tar.gz | |
Weston 1.4.0
Diffstat (limited to 'xwayland/window-manager.c')
| -rw-r--r-- | xwayland/window-manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index 70c8cf7c..1bb9825d 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -2214,12 +2214,12 @@ 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, - parent->x - window->x, - parent->y - window->y, 0); + window->x - parent->x, + window->y - parent->y, 0); } else { shell_interface->set_toplevel(window->shsurf); } |