diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-21 14:47:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-21 14:47:44 +0200 |
commit | 6e6decf38590e85c0c4d72f5215775e604516ad3 (patch) | |
tree | 658bc3a154b8e699679d7f7492ca13717bb9aaab | |
parent | Merge pull request #1835 from ascent12/swaybar_status_err (diff) | |
parent | Don't unmap on destroy, this is already guaranteed by wlroots (diff) | |
download | sway-6e6decf38590e85c0c4d72f5215775e604516ad3.tar.gz sway-6e6decf38590e85c0c4d72f5215775e604516ad3.tar.zst sway-6e6decf38590e85c0c4d72f5215775e604516ad3.zip |
Merge pull request #1834 from emersion/xwayland-no-unmap-on-destroy
Don't unmap on destroy, this is already guaranteed by wlroots
-rw-r--r-- | sway/desktop/xwayland.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 46eaa84c..cad9156d 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -257,11 +257,6 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
257 | static void handle_destroy(struct wl_listener *listener, void *data) { | 257 | static void handle_destroy(struct wl_listener *listener, void *data) { |
258 | struct sway_xwayland_view *xwayland_view = | 258 | struct sway_xwayland_view *xwayland_view = |
259 | wl_container_of(listener, xwayland_view, destroy); | 259 | wl_container_of(listener, xwayland_view, destroy); |
260 | struct sway_view *view = &xwayland_view->view; | ||
261 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | ||
262 | if (xsurface->mapped) { | ||
263 | handle_unmap(&xwayland_view->unmap, xsurface); | ||
264 | } | ||
265 | view_destroy(&xwayland_view->view); | 260 | view_destroy(&xwayland_view->view); |
266 | } | 261 | } |
267 | 262 | ||