1 files changed, 8 insertions, 4 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 81724cce..f2a16d7f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -94,6 +94,13 @@ static void * shutdownCode(void * unused) {
   return NULL;
 }
 
+static void gnunet_gtk_main_quit() {
+  setCustomLogProc(NULL);
+  run_with_save_calls(&shutdownCode,
+                      NULL);
+  gtk_main_quit();
+}
+
 int main(int argc, 
          char *argv[]) {
   GtkWidget * root;
@@ -116,7 +123,7 @@ int main(int argc,
   bind_textdomain_codeset("gnunet-gtk", "UTF-8");
 #endif
   startCron();
-  initGNUnetGTKCommon();
+  initGNUnetGTKCommon(&gnunet_gtk_main_quit);
   root
     = glade_xml_get_widget(getMainXML(),
                            "mainWindow");
@@ -127,9 +134,6 @@ int main(int argc,
   gdk_threads_enter();    
   gtk_main();
   gdk_threads_leave();
-  setCustomLogProc(NULL);
-  run_with_save_calls(&shutdownCode,
-                      NULL);
   doneGNUnetGTKCommon();
   doneUtil();