1 files changed, 12 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index ea3397d8..d5974479 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -230,13 +230,23 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
  * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct SearchLookup *sl;
   struct PseuLookupContext *lctx;
+  struct SearchResult *sr;
 
   GNUNET_GTK_tray_icon_destroy ();
-  if (fs != NULL)
+  while (NULL != (sr = pl_head))
+  {
+    GNUNET_FS_probe_stop (sr->probe);
+    sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
+  if (NULL != fs)
   {
     GNUNET_FS_stop (fs);
     fs = NULL;