diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-11-06 13:58:53 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-11-07 10:40:05 -0500 |
| commit | 3fb8253edb37fcb1bd325a400cb8151ca548ed50 (patch) | |
| tree | 55b9f904c42aaedcb469d40e3a84bc4f036c46e5 | |
| parent | e7cfd0667598d0213b2425ef7b9cd60ac666df69 (diff) | |
| download | enlightenment-3fb8253edb37fcb1bd325a400cb8151ca548ed50.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.c | 7 |
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 f3826c3cd9..7848595b32 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); } |