summaryrefslogtreecommitdiff
path: root/src/lib/ecore_ipc/ecore_ipc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_ipc/ecore_ipc.c')
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index 17f77441dc..dfacf933bc 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -323,13 +323,18 @@ ecore_ipc_init(void)
323 323
324 if (++_ecore_ipc_init_count != 1) 324 if (++_ecore_ipc_init_count != 1)
325 return _ecore_ipc_init_count; 325 return _ecore_ipc_init_count;
326 _ecore_ipc_log_dom = eina_log_domain_register 326
327 ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR); 327 if (_ecore_ipc_log_dom < 0)
328 if(_ecore_ipc_log_dom < 0)
329 { 328 {
330 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module."); 329 _ecore_ipc_log_dom = eina_log_domain_register
331 return --_ecore_ipc_init_count; 330 ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR);
331 if(_ecore_ipc_log_dom < 0)
332 {
333 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module.");
334 return --_ecore_ipc_init_count;
335 }
332 } 336 }
337
333 if (!ecore_con_init()) 338 if (!ecore_con_init())
334 return --_ecore_ipc_init_count; 339 return --_ecore_ipc_init_count;
335 340
@@ -378,8 +383,11 @@ ecore_ipc_shutdown(void)
378#endif 383#endif
379 384
380 ecore_con_shutdown(); 385 ecore_con_shutdown();
381 eina_log_domain_unregister(_ecore_ipc_log_dom); 386
382 _ecore_ipc_log_dom = -1; 387 /* do not unregister log domain as ecore_ipc_servers may be pending deletion
388 * due Ecore_Event.
389 */
390
383 return _ecore_ipc_init_count; 391 return _ecore_ipc_init_count;
384} 392}
385 393