Merge pull request #1834 from emersion/xwayland-no-unmap-on-destroy

Don't unmap on destroy, this is already guaranteed by wlroots
This commit is contained in:
Drew DeVault 2018-04-21 14:47:44 +02:00 committed by GitHub
commit 6e6decf385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -257,11 +257,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view = struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, destroy); wl_container_of(listener, xwayland_view, destroy);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (xsurface->mapped) {
handle_unmap(&xwayland_view->unmap, xsurface);
}
view_destroy(&xwayland_view->view); view_destroy(&xwayland_view->view);
} }