From f6636a8dec24340b9ec4ec5a1171d3efabf3904a Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Tue, 16 Aug 2016 10:55:02 +0200 Subject: [PATCH] libweston-desktop/xwayland: Actually destroy the view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Quentin Glidic Reviewed-by: Jonas Ådahl --- libweston-desktop/xwayland.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libweston-desktop/xwayland.c b/libweston-desktop/xwayland.c index 927afab1..da04f7f8 100644 --- a/libweston-desktop/xwayland.c +++ b/libweston-desktop/xwayland.c @@ -81,6 +81,7 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf if (surface->state != state) { if (surface->state == XWAYLAND) { weston_desktop_surface_unlink_view(surface->view); + weston_view_destroy(surface->view); surface->view = NULL; } @@ -149,11 +150,13 @@ weston_desktop_xwayland_surface_destroy(struct weston_desktop_surface *dsurface, wl_list_remove(&surface->resource_destroy_listener.link); weston_desktop_surface_unset_relative_to(surface->surface); - if (surface->added) + if (surface->added) { weston_desktop_api_surface_removed(surface->desktop, surface->surface); - else if (surface->state == XWAYLAND) + } else if (surface->state == XWAYLAND) { weston_desktop_surface_unlink_view(surface->view); + weston_view_destroy(surface->view); + } free(surface); }