forked from enlightenment/efl
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
This commit is contained in:
parent
df61af9efa
commit
0fd8cd82e3
|
@ -609,12 +609,12 @@ ecore_evas_init(void)
|
||||||
if (++_ecore_evas_init_count != 1)
|
if (++_ecore_evas_init_count != 1)
|
||||||
return _ecore_evas_init_count;
|
return _ecore_evas_init_count;
|
||||||
|
|
||||||
if (!evas_init())
|
|
||||||
return --_ecore_evas_init_count;
|
|
||||||
|
|
||||||
if (!ecore_init())
|
if (!ecore_init())
|
||||||
goto shutdown_evas;
|
goto shutdown_evas;
|
||||||
|
|
||||||
|
if (!evas_init())
|
||||||
|
return --_ecore_evas_init_count;
|
||||||
|
|
||||||
_ecore_evas_log_dom = eina_log_domain_register
|
_ecore_evas_log_dom = eina_log_domain_register
|
||||||
("ecore_evas", ECORE_EVAS_DEFAULT_LOG_COLOR);
|
("ecore_evas", ECORE_EVAS_DEFAULT_LOG_COLOR);
|
||||||
if(_ecore_evas_log_dom < 0)
|
if(_ecore_evas_log_dom < 0)
|
||||||
|
@ -700,8 +700,8 @@ ecore_evas_shutdown(void)
|
||||||
|
|
||||||
eina_log_domain_unregister(_ecore_evas_log_dom);
|
eina_log_domain_unregister(_ecore_evas_log_dom);
|
||||||
_ecore_evas_log_dom = -1;
|
_ecore_evas_log_dom = -1;
|
||||||
ecore_shutdown();
|
|
||||||
evas_shutdown();
|
evas_shutdown();
|
||||||
|
ecore_shutdown();
|
||||||
|
|
||||||
return _ecore_evas_init_count;
|
return _ecore_evas_init_count;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue