1 files changed, 19 insertions, 2 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 136eff23..6844a076 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/gnunet-setup.c
+ * @file src/setup/gnunet-setup.c
  * @brief Main function of gnunet-setup
  * @author Christian Grothoff
  */
@@ -56,6 +56,12 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
 static int gret;
 
 /**
+ * Resolver process handle.
+ */
+struct GNUNET_OS_Process *resolver;
+
+
+/**
  * Get an object from the main window.
  *
  * @param name name of the object
@@ -64,6 +70,8 @@ static int gret;
 GObject *
 GNUNET_SETUP_get_object (const char *name)
 {
+  if (NULL == ml)
+    return NULL;
   return GNUNET_GTK_main_loop_get_object (ml, name);
 }
 
@@ -305,6 +313,13 @@ GNUNET_SETUP_quit_cb (GtkObject *object,
     gret = 1;    
   GNUNET_CONFIGURATION_destroy (cfgDefault);
   GNUNET_CONFIGURATION_destroy (cfg);
+  cfg = NULL;
+  if (NULL != resolver)
+    {
+      GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
+      GNUNET_OS_process_close (resolver);
+      resolver = NULL;
+    }
 }
 
 
@@ -324,7 +339,9 @@ run (void *cls,
   cfg = GNUNET_CONFIGURATION_create ();
   (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
-
+  resolver = GNUNET_OS_start_process (NULL, NULL,
+                                      "gnunet-service-resolver", 
+                                      "gnunet-service-resolver", NULL);
   load_options ();
   gtk_widget_show (main_window);
   gtk_window_present (GTK_WINDOW (main_window));