1 files changed, 5 insertions, 0 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index d6f6e53d..b5dca553 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -3294,7 +3294,10 @@ run (void *cls)
   if (GNUNET_OK !=
       GNUNET_GTK_main_loop_build_window (ml,
                                          NULL))
+  {
+    GNUNET_SCHEDULER_shutdown ();
     return;
+  }
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
 
@@ -3310,6 +3313,8 @@ run (void *cls)
     gtk_label_set_markup (status_label,
                           label);
     g_free (label);
+    GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+                                   NULL);
     return;
   }
   ts = GTK_TREE_STORE (get_object ("gnunet_namestore_gtk_treestore"));