discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e95e7a93b8e3394297812dc6492a685f6334996
commit 9e95e7a93b8e3394297812dc6492a685f6334996 Author: Mike Blumenkrantz <[email protected]> Date: Tue Jul 12 12:46:59 2016 -0400 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 09cbe58..9727e74 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5399,6 +5399,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) { @@ -5414,7 +5415,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 --
