forked from enlightenment/efl
Revert "Really run elm_shutdown in the ELM_MAIN macro."
This reverts commit 65a09abb94728e08eceaf08faf4146e1d35724e7. This does break abi. debate as to if this should hsve been done in the macro or not is another matter.. but changing this does break abi/behaviour.
This commit is contained in:
parent
92af403f53
commit
1f82ec7a4a
|
@ -829,6 +829,7 @@ elm_main(int argc, char **argv)
|
|||
EINA_LIST_FREE(tests, t)
|
||||
free(t);
|
||||
|
||||
elm_shutdown(); /* clean up and shut down */
|
||||
/* exit code */
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -120,7 +120,7 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
|
|||
extern EAPI double _elm_startup_time;
|
||||
|
||||
#ifndef ELM_LIB_QUICKLAUNCH
|
||||
#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
|
||||
#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); return ret; } /**< macro to be used after the elm_main() function */
|
||||
#else
|
||||
#define ELM_MAIN() int main(int argc, char **argv) { _elm_startup_time = ecore_time_unix_get(); return elm_quicklaunch_fallback(argc, argv); } /**< macro to be used after the elm_main() function */
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue