diff options
author | 2018-04-13 09:14:37 -0400 | |
---|---|---|
committer | 2018-04-13 09:14:37 -0400 | |
commit | 2b34bf1882f24ebd8c87debb2e2223bc084736c3 (patch) | |
tree | b27acb8f604bf5fc5cc39b927d3e62d748cf7313 /sway | |
parent | container_destroy: fix segfault (diff) | |
parent | Merge pull request #1808 from emersion/xwayland-unmapped-on-create (diff) | |
download | sway-2b34bf1882f24ebd8c87debb2e2223bc084736c3.tar.gz sway-2b34bf1882f24ebd8c87debb2e2223bc084736c3.tar.zst sway-2b34bf1882f24ebd8c87debb2e2223bc084736c3.zip |
Merge branch 'master' into crashes
Diffstat (limited to 'sway')
-rw-r--r-- | sway/desktop/xwayland.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 413dbf8b..69166af0 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -113,8 +113,6 @@ static struct sway_xwayland_unmanaged *create_unmanaged( | |||
113 | wl_signal_add(&xsurface->events.destroy, &surface->destroy); | 113 | wl_signal_add(&xsurface->events.destroy, &surface->destroy); |
114 | surface->destroy.notify = unmanaged_handle_destroy; | 114 | surface->destroy.notify = unmanaged_handle_destroy; |
115 | 115 | ||
116 | unmanaged_handle_map(&surface->map, xsurface); | ||
117 | |||
118 | return surface; | 116 | return surface; |
119 | } | 117 | } |
120 | 118 | ||
@@ -305,6 +303,4 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { | |||
305 | 303 | ||
306 | wl_signal_add(&xsurface->events.map, &xwayland_view->map); | 304 | wl_signal_add(&xsurface->events.map, &xwayland_view->map); |
307 | xwayland_view->map.notify = handle_map; | 305 | xwayland_view->map.notify = handle_map; |
308 | |||
309 | handle_map(&xwayland_view->map, xsurface); | ||
310 | } | 306 | } |