From f839905184ef084fad55f3deadd51b405768a49c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 26 Sep 2017 16:32:29 +0900 Subject: ecore_ipc: Unregister log domain on shutdown An old comment mentioned that this was explicitely not unregistered, but I believe the comment isn't valid since ecore_event_type_flush() was introduced. --- src/lib/ecore_ipc/ecore_ipc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/lib/ecore_ipc') diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index 0b27496d2f..c0bd6ee1f0 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c @@ -309,19 +309,20 @@ ecore_ipc_init(void) if (++_ecore_ipc_init_count != 1) return _ecore_ipc_init_count; - if (_ecore_ipc_log_dom < 0) + _ecore_ipc_log_dom = eina_log_domain_register + ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR); + if(_ecore_ipc_log_dom < 0) { - _ecore_ipc_log_dom = eina_log_domain_register - ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR); - if(_ecore_ipc_log_dom < 0) - { - EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module."); - return --_ecore_ipc_init_count; - } + EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module."); + return --_ecore_ipc_init_count; } if (!ecore_con_init()) - return --_ecore_ipc_init_count; + { + eina_log_domain_unregister(_ecore_ipc_log_dom); + _ecore_ipc_log_dom = -1; + return --_ecore_ipc_init_count; + } ECORE_IPC_EVENT_CLIENT_ADD = ecore_event_type_new(); ECORE_IPC_EVENT_CLIENT_DEL = ecore_event_type_new(); @@ -353,9 +354,8 @@ ecore_ipc_shutdown(void) ecore_con_shutdown(); - /* do not unregister log domain as ecore_ipc_servers may be pending deletion - * due Ecore_Event. - */ + eina_log_domain_unregister(_ecore_ipc_log_dom); + _ecore_ipc_log_dom = -1; return _ecore_ipc_init_count; } -- cgit v1.2.1