summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-12-18 12:04:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-12-18 19:54:31 +0900
commitc0c5e72408f43206bdf428431e2a24446f8b9875 (patch)
tree76b17606d60fe154a9618b6a550887f4e9593c59 /src/lib
parent81bad9f47c27099e655e124f054e431290cc3aa4 (diff)
ecore_con: Properly shutdown and unregister log domain
I believe the comment saying we should not unregister the log domain is invalid as we try to flush the pending ecore events.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore_con/ecore_con.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index f071cd90d5..a396fa9ae8 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -92,13 +92,10 @@ ecore_con_init(void)
92 if (!ecore_init()) 92 if (!ecore_init())
93 goto ecore_err; 93 goto ecore_err;
94 94
95 _ecore_con_log_dom = eina_log_domain_register
96 ("ecore_con", ECORE_CON_DEFAULT_LOG_COLOR);
95 if (_ecore_con_log_dom < 0) 97 if (_ecore_con_log_dom < 0)
96 { 98 goto ecore_con_log_error;
97 _ecore_con_log_dom = eina_log_domain_register
98 ("ecore_con", ECORE_CON_DEFAULT_LOG_COLOR);
99 if (_ecore_con_log_dom < 0)
100 goto ecore_con_log_error;
101 }
102 99
103 _efl_net_proxy_helper_init(); 100 _efl_net_proxy_helper_init();
104 101
@@ -155,9 +152,8 @@ ecore_con_shutdown(void)
155 152
156 ecore_con_legacy_shutdown(); 153 ecore_con_legacy_shutdown();
157 154
158 /* do not unregister log domain as ecore_con_servers may be pending deletion 155 eina_log_domain_unregister(_ecore_con_log_dom);
159 * due Ecore_Event. 156 _ecore_con_log_dom = -1;
160 */
161 157
162 ecore_shutdown(); 158 ecore_shutdown();
163#ifdef _WIN32 159#ifdef _WIN32