1 files changed, 32 insertions, 0 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 52a12caa..ec1f60ad 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -246,6 +246,16 @@ struct PublishEntry
 
 
 /**
+ * Head of search results with a manually-activated probe.
+ */
+struct SearchResult *pl_head;
+
+/**
+ * Tail of search results with a manually-activated probe.
+ */
+struct SearchResult *pl_tail;
+
+/**
  * Head of linked list of tabs for searches.
  */
 static struct SearchTab *search_tab_head;
@@ -1722,7 +1732,13 @@ move_downloads_in_subtree (GtkTreeModel *tm,
         GNUNET_CONTAINER_meta_data_destroy (meta);
       gtk_tree_row_reference_free (sr->rr);
       if (NULL != sr->probe)
+      {
         GNUNET_FS_probe_stop (sr->probe);
+        sr->probe = NULL;
+        GNUNET_CONTAINER_DLL_remove (pl_head,
+                                     pl_tail,
+                                     sr);
+      }
       GNUNET_free (sr);
       /* get ready for removal of the tree */
       gtk_tree_store_set (GTK_TREE_STORE (tm), &child,
@@ -1781,7 +1797,13 @@ free_search_result (struct SearchResult *sr)
     GNUNET_CONTAINER_meta_data_destroy (meta);
   gtk_tree_row_reference_free (sr->rr);
   if (NULL != sr->probe)
+  {
     GNUNET_FS_probe_stop (sr->probe);
+    sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
   GNUNET_free (sr);
   move_downloads_in_subtree (tm, &iter);
   GNUNET_FS_GTK_remove_treestore_subtree (GTK_TREE_STORE (tm), &iter);
@@ -2317,11 +2339,16 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   sr = GNUNET_new (struct SearchResult);
   sr->result = result;
   if (NULL == result)
+  {
     sr->probe = GNUNET_FS_probe (GNUNET_FS_GTK_get_fs_handle (),
                                  uri,
                                  meta,
                                  sr,
                                  anonymity);
+    GNUNET_CONTAINER_DLL_insert (pl_head,
+                                 pl_tail,
+                                 sr);
+  }
   sr->tab = tab;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Allocated a search result SR=%p\n",
@@ -3142,6 +3169,11 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
        download in the URI tab */
     de->sr = GNUNET_GTK_add_to_uri_tab (anonymity,
                                         meta, uri);
+    GNUNET_FS_probe_stop (de->sr->probe);
+    de->sr->probe = NULL;
+    GNUNET_CONTAINER_DLL_remove (pl_head,
+                                 pl_tail,
+                                 de->sr);
     de->sr->download = de;
     path = gtk_tree_row_reference_get_path (de->sr->rr);
     if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))