From 0fd8cd82e3e45dc9a5912cde2a330d1ef05a27b7 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 5 Jan 2018 02:10:26 +0900 Subject: [PATCH] ecore evas init - init ecore then evas not the other way... because as of... i don't know when, evas relies on ecore with ecore_pipe_add to create the async fd... and if you init evas then ecore this doesnt work. obviously. well now it isn't working. probably due to new efl loop work. but the efl loop code is correct. ecore_pipe_add should never work until you init ecore... it just happesn to have managed to be gotten away with for a while. @fix --- src/lib/ecore_evas/ecore_evas.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 11c043e606..baeb5f1db9 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -609,12 +609,12 @@ ecore_evas_init(void) if (++_ecore_evas_init_count != 1) return _ecore_evas_init_count; - if (!evas_init()) - return --_ecore_evas_init_count; - if (!ecore_init()) goto shutdown_evas; + if (!evas_init()) + return --_ecore_evas_init_count; + _ecore_evas_log_dom = eina_log_domain_register ("ecore_evas", ECORE_EVAS_DEFAULT_LOG_COLOR); if(_ecore_evas_log_dom < 0) @@ -700,8 +700,8 @@ ecore_evas_shutdown(void) eina_log_domain_unregister(_ecore_evas_log_dom); _ecore_evas_log_dom = -1; - ecore_shutdown(); evas_shutdown(); + ecore_shutdown(); return _ecore_evas_init_count; }