summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas/ecore_evas.c
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-01-05 02:34:16 +0900
commit0fd8cd82e3e45dc9a5912cde2a330d1ef05a27b7 (patch)
tree25ef3ecdabfcb9c02c9b16c45f1d6ac2515e1014 /src/lib/ecore_evas/ecore_evas.c
parentdf61af9efab3082aaf6171c37a11cafb2a49c9bf (diff)
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
Diffstat (limited to 'src/lib/ecore_evas/ecore_evas.c')
-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 11c043e..baeb5f1 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)
609 if (++_ecore_evas_init_count != 1) 609 if (++_ecore_evas_init_count != 1)
610 return _ecore_evas_init_count; 610 return _ecore_evas_init_count;
611 611
612 if (!evas_init())
613 return --_ecore_evas_init_count;
614
615 if (!ecore_init()) 612 if (!ecore_init())
616 goto shutdown_evas; 613 goto shutdown_evas;
617 614
615 if (!evas_init())
616 return --_ecore_evas_init_count;
617
618 _ecore_evas_log_dom = eina_log_domain_register 618 _ecore_evas_log_dom = eina_log_domain_register
619 ("ecore_evas", ECORE_EVAS_DEFAULT_LOG_COLOR); 619 ("ecore_evas", ECORE_EVAS_DEFAULT_LOG_COLOR);
620 if(_ecore_evas_log_dom < 0) 620 if(_ecore_evas_log_dom < 0)
@@ -700,8 +700,8 @@ ecore_evas_shutdown(void)
700 700
701 eina_log_domain_unregister(_ecore_evas_log_dom); 701 eina_log_domain_unregister(_ecore_evas_log_dom);
702 _ecore_evas_log_dom = -1; 702 _ecore_evas_log_dom = -1;
703 ecore_shutdown();
704 evas_shutdown(); 703 evas_shutdown();
704 ecore_shutdown();
705 705
706 return _ecore_evas_init_count; 706 return _ecore_evas_init_count;
707} 707}