discomfitor pushed a commit to branch enlightenment-0.21. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e91dcec87089e492b96888e37d75fb7d6c1ec608
commit e91dcec87089e492b96888e37d75fb7d6c1ec608 Author: Derek Foreman <[email protected]> Date: Wed Oct 25 14:09:12 2017 -0500 Fix crash on wayland logout if xwayland hasn't started yet If xwayland hasn't started yet then the root window id is 0, which is invalid, so we crash in e_comp_x_shutdown. --- src/modules/xwayland/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c index 92036847d..8f806b484 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -452,7 +452,7 @@ xwl_shutdown(void) if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); free(exs); - e_comp_x_shutdown(); + if (e_comp_util_has_x()) e_comp_x_shutdown(); ecore_x_shutdown(); e_util_env_set("DISPLAY", NULL); } --
