From 0361db9fd5ffe971de2364ada2f1613a5d0324e5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Aug 2017 18:48:53 -0400 Subject: [PATCH] handle case where eglBindWaylandDisplay fails during wl init --- src/bin/e_comp_wl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index cd8edfd10..92458f9e1 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2802,10 +2802,9 @@ _e_comp_wl_gl_init(void) evas_gl_make_current(e_comp_wl->wl.gl, e_comp_wl->wl.glsfc, e_comp_wl->wl.glctx); e_comp_wl->wl.glapi = evas_gl_context_api_get(e_comp_wl->wl.gl, e_comp_wl->wl.glctx); if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay) - { - e_util_env_set("ELM_ACCEL", "gl"); - e_comp->gl = e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, e_comp_wl->wl.disp); - } + e_comp->gl = e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, e_comp_wl->wl.disp); + if (e_comp->gl) + e_util_env_set("ELM_ACCEL", "gl"); else _e_comp_wl_gl_shutdown(); }