1 files changed, 34 insertions, 21 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index a851b6cb..5c2b0df7 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2007 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -908,13 +908,19 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  fcbc.method = &FSUI_abortSearch;
-  fcbc.argument = list->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
-  fcbc.method = &FSUI_stopSearch;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  if (list->fsui_list == NULL) {
+    /* open directory - close directly */
+    fs_search_stopped(list);
+  } else {
+    /* actual search - close via FSUI */
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = list->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+    fcbc.method = &FSUI_stopSearch;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**
@@ -932,11 +938,12 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-
-  fcbc.method = &FSUI_abortSearch;
-  fcbc.argument = list->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  if (list->fsui_list != NULL) {
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = list->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 static void stopSearch(GtkTreeModel * model,
@@ -952,13 +959,18 @@ static void stopSearch(GtkTreeModel * model,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL) {
-    fcbc.method = &FSUI_abortSearch;
-    fcbc.argument = s->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-    fcbc.method = &FSUI_stopSearch;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
+    if (s->fsui_list == NULL) {
+      /* open directory - close directly */
+      fs_search_stopped(s);
+    } else {
+      fcbc.method = &FSUI_abortSearch;
+      fcbc.argument = s->fsui_list;
+      run_with_save_calls(&fsui_callback,
+                          &fcbc);
+      fcbc.method = &FSUI_stopSearch;
+      run_with_save_calls(&fsui_callback,
+                          &fcbc);
+    }
   }
 }
 
@@ -988,7 +1000,8 @@ static void abortSearch(GtkTreeModel * model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL) {
+  if ( (s != NULL) &&
+       (s->fsui_list != NULL) ) {
     fcbc.method = &FSUI_abortSearch;
     fcbc.argument = s->fsui_list;
     run_with_save_calls(&fsui_callback,