commit f0d79a9fe13700efdebb6dcf6b72c69a00fcf77e
parent ce54303a7085492ed01211def72f9027b702b792
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Tue, 25 Sep 2012 21:54:20 -0600
add more shutdown hooks
Diffstat:
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -882,6 +882,9 @@ elm_main(int argc, char *argv[])
textdomain(GETTEXT_PACKAGE);
#endif
+ if (!elm_need_web())
+ return -1;
+
/* calloc zeros the memory!! */
ad = calloc(1, sizeof(App_Data));
if (!ad) return -1;
@@ -890,9 +893,6 @@ elm_main(int argc, char *argv[])
if (ad->log_domain < 0)
EINA_LOG_CRIT("could not create log domain 'viking'.");
- if (!elm_need_web())
- return -1;
-
setup_config(ad, argc, argv);
setup_gui(ad);
setup_modkeys(ad);
@@ -932,8 +932,10 @@ elm_main(int argc, char *argv[])
if (ad->session_save_timer) ecore_timer_del(ad->session_save_timer);
eina_log_domain_unregister(ad->log_domain);
+ ad->log_domain = -1;
elm_shutdown();
+ ewk_shutdown();
viking_state_shutdown();
free(ad->modkeys);
@@ -942,6 +944,5 @@ elm_main(int argc, char *argv[])
return 0;
}
-
ELM_MAIN()