From 6ce9a41290727da46d420a20527cdd228008fd8d Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 29 Apr 2013 17:25:11 +0100 Subject: [PATCH] Really run elm_shutdown in the ELM_MAIN macro. Previous commit failed to actually do it. --- legacy/elementary/src/bin/test.c | 1 - legacy/elementary/src/lib/elm_general.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index c0ab461283..b404f61eb2 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -829,7 +829,6 @@ elm_main(int argc, char **argv) EINA_LIST_FREE(tests, t) free(t); - elm_shutdown(); /* clean up and shut down */ /* exit code */ return 0; } diff --git a/legacy/elementary/src/lib/elm_general.h b/legacy/elementary/src/lib/elm_general.h index 90b790ba46..ee6231a717 100644 --- a/legacy/elementary/src/lib/elm_general.h +++ b/legacy/elementary/src/lib/elm_general.h @@ -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); 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 #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