forked from enlightenment/efl
Really run elm_shutdown in the ELM_MAIN macro.
Previous commit failed to actually do it.
This commit is contained in:
parent
7edc0d056e
commit
6ce9a41290
|
@ -829,7 +829,6 @@ elm_main(int argc, char **argv)
|
||||||
EINA_LIST_FREE(tests, t)
|
EINA_LIST_FREE(tests, t)
|
||||||
free(t);
|
free(t);
|
||||||
|
|
||||||
elm_shutdown(); /* clean up and shut down */
|
|
||||||
/* exit code */
|
/* exit code */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,7 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
|
||||||
extern EAPI double _elm_startup_time;
|
extern EAPI double _elm_startup_time;
|
||||||
|
|
||||||
#ifndef ELM_LIB_QUICKLAUNCH
|
#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); 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); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
|
||||||
#else
|
#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 */
|
#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
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue