aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-11-06 13:58:53 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-11-08 09:56:44 -0500
commit7a9a4b085502014acd44c5b5e225093a1ebe672c (patch)
tree05ecc6c1ebbdc1bfb0c5173352aa40ffb8fb8709
parentavoid performing client rescales during shutdown (diff)
downloadenlightenment-7a9a4b085502014acd44c5b5e225093a1ebe672c.tar.gz
prevent double shutdown of x11 compositor in xwayland mode
only do shutdown in xwl module if not actively shutting down
-rw-r--r--src/modules/xwayland/e_mod_main.c7
1 files 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);
}