summaryrefslogtreecommitdiff
path: root/libweston
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>2016-09-01 15:19:46 +0100
committerQuentin Glidic <sardemff7+git@sardemff7.net>2016-09-02 22:15:59 +0200
commit85571a300206efbffdd12f550f1dbc2d59ac005e (patch)
treea506e1f35fa9d334ae03fd9f6d1de20b9d5b328e /libweston
parent1714f01e0cfcc6b71946d5c8d9898a2eaba86fac (diff)
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 <emmanuel.peyrot@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'libweston')
-rw-r--r--libweston/compositor-wayland.c2
1 files changed, 1 insertions, 1 deletions
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);