summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-05 02:10:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-02-07 02:56:16 +0900
commitdf8f08b129911c0c400909cab26028f3b0bd5276 (patch)
treee8cd9479fb869192b94c6d1ceb877edde29ba39a
parent0d6123f6f781f18b6731dfbd153a3b7e9a534392 (diff)
downloadefl-df8f08b129911c0c400909cab26028f3b0bd5276.tar.gz
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
-rw-r--r--src/lib/ecore_evas/ecore_evas.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 39b93e587b..d108dfd8c3 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -613,12 +613,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)
@@ -704,8 +704,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;
}