[EGIT] [core/enlightenment] master 01/03: move x11 compositor cleanup into shutdown function

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=40be5b9d45bb1dd71cda5db5d07b45bfae01dc54

commit 40be5b9d45bb1dd71cda5db5d07b45bfae01dc54
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Oct 24 15:51:02 2017 -0400

    move x11 compositor cleanup into shutdown function
---
 src/bin/e_comp_x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 314d6c264..8f4e9555e 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5393,6 +5393,7 @@ _e_comp_x_del(E_Comp *c)
    E_FREE_FUNC(focus_job, ecore_job_del);
    E_FREE_FUNC(unfocus_job, ecore_job_del);
    free(c->x_comp_data);
+   c->x_comp_data = e_comp_x = NULL;
 }
 
 static void
@@ -5640,7 +5641,6 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
      }
    if (!ecore_x_window_manage(root)) return EINA_FALSE;
 
-   E_OBJECT_DEL_SET(e_comp, _e_comp_x_del);
    e_comp_x = e_comp->x_comp_data = E_NEW(E_Comp_X_Data, 1);
    ecore_x_e_window_profile_supported_set(root, EINA_TRUE);
    e_comp->cm_selection = ecore_x_window_input_new(root, 0, 0, 1, 1);
@@ -5946,6 +5946,7 @@ e_comp_x_init(void)
 E_API void
 e_comp_x_shutdown(void)
 {
+   _e_comp_x_del(e_comp);
    E_FREE_LIST(handlers, ecore_event_handler_del);
    E_FREE_FUNC(clients_win_hash, eina_hash_free);
    E_FREE_FUNC(damages_hash, eina_hash_free);

--