summaryrefslogtreecommitdiff
path: root/src/modules
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-07 10:40:05 -0500
commit3fb8253edb37fcb1bd325a400cb8151ca548ed50 (patch)
tree55b9f904c42aaedcb469d40e3a84bc4f036c46e5 /src/modules
parente7cfd0667598d0213b2425ef7b9cd60ac666df69 (diff)
prevent double shutdown of x11 compositor in xwayland mode
only do shutdown in xwl module if not actively shutting down
Diffstat (limited to 'src/modules')
-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 f3826c3..7848595 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -451,8 +451,11 @@ xwl_shutdown(void)
451 if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); 451 if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
452 452
453 free(exs); 453 free(exs);
454 if (e_comp_util_has_x()) e_comp_x_shutdown(); 454 if (!stopping)
455 ecore_x_shutdown(); 455 {
456 if (e_comp_util_has_x()) e_comp_x_shutdown();
457 ecore_x_shutdown();
458 }
456 e_util_env_set("DISPLAY", NULL); 459 e_util_env_set("DISPLAY", NULL);
457} 460}
458 461