timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_con: make the ecore_con log domain available during ecore_shutdown.

This commit is contained in:
Cedric BAIL 2018-04-09 16:57:25 -07:00
parent 3e648c475f
commit 67cbc0d8af
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/ecore_con/ecore_con.c
View File

@ -89,14 +89,17 @@ ecore_con_init(void)
return --_ecore_con_init_count;
#endif
if (!ecore_init())
goto ecore_err;
if (!eina_init())
goto eina_err;
_ecore_con_log_dom = eina_log_domain_register
("ecore_con", ECORE_CON_DEFAULT_LOG_COLOR);
if (_ecore_con_log_dom < 0)
goto ecore_con_log_error;
if (!ecore_init())
goto ecore_err;
_efl_net_proxy_helper_init();
ecore_con_mempool_init();
@ -125,7 +128,9 @@ ecore_con_log_error:
EINA_LOG_ERR("Failed to create a log domain for Ecore Con.");
ecore_shutdown();
ecore_err:
ecore_err:
eina_shutdown();
eina_err:
#ifdef _WIN32
evil_shutdown();
#endif
@ -152,14 +157,16 @@ ecore_con_shutdown(void)
ecore_con_legacy_shutdown();
eina_log_domain_unregister(_ecore_con_log_dom);
_ecore_con_log_dom = -1;
ecore_shutdown();
#ifdef _WIN32
evil_shutdown();
#endif
eina_log_domain_unregister(_ecore_con_log_dom);
_ecore_con_log_dom = -1;
eina_shutdown();
return _ecore_con_init_count;
}