[PATCH weston] desktop-shell: Properly destroy the weston_desktop_view

[Jonas Ådahl]

On Tue, Aug 16, 2016 at 10:28:21AM +0200, Quentin Glidic wrote:
> From: Quentin Glidic <sardemff7+git at sardemff7.net>
> 
> Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>

As discussed, API naming can be improved, but lets do that in the follow
up. This is

Reviewed-by: Jonas Ådahl <jadahl at gmail.com>


Jonas

> ---
>  desktop-shell/shell.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
> index 786020b..8023b0d 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -2364,6 +2364,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface,
>  	weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL);
>  	shsurf->desktop_surface = NULL;
>  
> +	weston_desktop_surface_destroy_view(shsurf->view);
>  	if (weston_surface_is_mapped(surface) &&
>  	    shsurf->shell->win_close_animation_type == ANIMATION_FADE) {
>  		pixman_region32_fini(&surface->pending.input);
> @@ -2373,7 +2374,6 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface,
>  		weston_fade_run(shsurf->view, 1.0, 0.0, 300.0,
>  				fade_out_done, shsurf);
>  	} else {
> -		weston_desktop_surface_destroy_view(shsurf->view);
>  		weston_view_destroy(shsurf->view);
>  		free(shsurf);
>  	}
> -- 
> 2.9.2
>