1 files changed, 19 insertions, 6 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index e83f354e..92f72589 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -93,7 +93,7 @@ help_click_callback (GtkWidget * widget, GdkEventButton * event,
 
 
 /**
- * Change the visibility of widgets according to the 
+ * Change the visibility of widgets according to the
  * value and visibility specification given.
  *
  * @param os option specification
@@ -265,15 +265,17 @@ load_options ()
     }
     i++;
   }
-
 }
 
 
 /**
- * Callback invoked if the application is supposed to exit.
+ * Actual main method that sets up the configuration window.
+ *
+ * @param cls the main loop handle
+ * @param tc scheduler context
  */
-void
-GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
+static void
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CONFIGURATION_Handle *cfgDefault;
 
@@ -295,6 +297,17 @@ GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
 
 
 /**
+ * Callback invoked if the application is supposed to exit.
+ */
+void
+GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
+{
+  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                      &cleanup_task, NULL);
+}
+
+
+/**
  * Actual main method that sets up the configuration window.
  *
  * @param cls the main loop handle
@@ -303,9 +316,9 @@ GNUNET_SETUP_quit_cb (GObject * object, gpointer user_data)
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  ml = cls;
   GtkWidget *main_window;
 
+  ml = cls;
   cfg = GNUNET_CONFIGURATION_create ();
   (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));