cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1112ce2a8ad0ce7938d7efc6e59806304a4ca4bd

commit 1112ce2a8ad0ce7938d7efc6e59806304a4ca4bd
Author: Cedric Bail <[email protected]>
Date:   Wed Nov 15 16:26:32 2017 -0800

    ecore: should be the one triggering EFL_LOOP_EVENT_TERMINATE.
---
 src/lib/ecore/ecore.c         | 2 ++
 src/lib/elementary/elm_main.c | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 2e6644e422..93a865f325 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -387,6 +387,8 @@ ecore_shutdown(void)
      if (_ecore_init_count-- != _ecore_init_count_threshold)
        goto end;
 
+     efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, 
NULL);
+
      ecore_system_modules_unload();
 
      eina_log_timing(_ecore_log_dom,
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index a3aed021e0..a018111111 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -441,8 +441,6 @@ elm_shutdown(void)
    _elm_init_count--;
    if (_elm_init_count > 0) return _elm_init_count;
 
-   efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, 
NULL);
-
    ecore_event_handler_del(system_handlers[0]);
    ecore_event_handler_del(system_handlers[1]);
 

-- 


Reply via email to