prevent double shutdown of x11 compositor in xwayland mode

only do shutdown in xwl module if not actively shutting down
6 years ago · 3fb8253edb
parent e7cfd06675
commit 3fb8253edb
1 changed files with 5 additions and 2 deletions
--- 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);
 }