From 3fb8253edb37fcb1bd325a400cb8151ca548ed50 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 6 Nov 2017 13:58:53 -0500 Subject: [PATCH] prevent double shutdown of x11 compositor in xwayland mode only do shutdown in xwl module if not actively shutting down --- src/modules/xwayland/e_mod_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c index f3826c3cd..7848595b3 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -451,8 +451,11 @@ xwl_shutdown(void) if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); free(exs); - if (e_comp_util_has_x()) e_comp_x_shutdown(); - ecore_x_shutdown(); + if (!stopping) + { + if (e_comp_util_has_x()) e_comp_x_shutdown(); + ecore_x_shutdown(); + } e_util_env_set("DISPLAY", NULL); }