[PATCH weston] compositor-wayland: Only destroy the egl_window when using GLES.

Derek Foreman derekf at osg.samsung.com
Fri Sep 2 20:10:14 UTC 2016


On 01/09/16 09:19 AM, Emmanuel Gil Peyrot wrote:
> This prevents a segfault when unplugging an output when using pixman.
> 
> Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot at collabora.com>

Reviewed-by: Derek Foreman <derekf at osg.samsung.com>

> ---
>  libweston/compositor-wayland.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
> index 7c12b4c..c223baa 100644
> --- a/libweston/compositor-wayland.c
> +++ b/libweston/compositor-wayland.c
> @@ -627,9 +627,9 @@ wayland_output_destroy(struct weston_output *output_base)
>  		pixman_renderer_output_destroy(output_base);
>  	} else {
>  		gl_renderer->output_destroy(output_base);
> +		wl_egl_window_destroy(output->gl.egl_window);
>  	}
>  
> -	wl_egl_window_destroy(output->gl.egl_window);
>  	wl_surface_destroy(output->parent.surface);
>  	if (output->parent.shell_surface)
>  		wl_shell_surface_destroy(output->parent.shell_surface);
> 



More information about the wayland-devel mailing list