From 00f1686ce5b20fc2000ff577329f804f2a7b596a Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Mon, 25 Sep 2017 19:25:59 -0400 Subject: unset egl current before terminating display fixes segfault when closing the compositor with an egl window. --- render/egl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'render/egl.c') diff --git a/render/egl.c b/render/egl.c index 2db8d4c0..048626ba 100644 --- a/render/egl.c +++ b/render/egl.c @@ -175,13 +175,14 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, return true; error: + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglTerminate(egl->display); eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); return false; } void wlr_egl_free(struct wlr_egl *egl) { + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (egl->wl_display && egl->eglUnbindWaylandDisplayWL) { egl->eglUnbindWaylandDisplayWL(egl->display, egl->wl_display); } @@ -189,7 +190,6 @@ void wlr_egl_free(struct wlr_egl *egl) { eglDestroyContext(egl->display, egl->context); eglTerminate(egl->display); eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); } bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display) { -- cgit v1.2.3