From 85571a300206efbffdd12f550f1dbc2d59ac005e Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 1 Sep 2016 15:19:46 +0100 Subject: [PATCH] compositor-wayland: Only destroy the egl_window when using GLES. This prevents a segfault when unplugging an output when using pixman. Signed-off-by: Emmanuel Gil Peyrot Reviewed-by: Derek Foreman Reviewed-by: Quentin Glidic --- 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 7c12b4c1..c223baa3 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);