From 9487da476bd4f29b8004976d6c8b5b9439757932 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 12 Jul 2016 12:46:59 -0400 Subject: [PATCH] handle e_comp_x init failure more effectively and perform cleanups fixes autodetection for x11 wayland output without setting E_WL_FORCE --- src/bin/e_comp_x.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 288d885b8..e1ee1c7d8 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5485,6 +5485,7 @@ _e_comp_x_screens_setup(void) { Ecore_X_Window root; int rw, rh; + Eina_Bool ret; if (e_comp->comp_type == E_PIXMAP_TYPE_NONE) { @@ -5500,7 +5501,12 @@ _e_comp_x_screens_setup(void) ecore_x_window_size_get(root, &rw, &rh); if (e_comp->comp_type == E_PIXMAP_TYPE_NONE) e_randr2_screens_setup(rw, rh); - return _e_comp_x_setup(root, rw, rh); + ret = _e_comp_x_setup(root, rw, rh); + if (ret) return EINA_TRUE; + e_randr2_shutdown(); + e_xinerama_screens_set(NULL); + e_comp->screen = NULL; + return EINA_FALSE; } E_API Eina_Bool