1 files changed, 32 insertions, 8 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index acb046c6..71744feb 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -588,6 +588,19 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
                    uri);
 }
 
+struct FCBC {
+  int (*method)(struct FSUI_Context * ctx,
+                struct FSUI_SearchList * list);
+  struct FSUI_SearchList * argument;
+};
+
+static void * fsui_callback(void * cls) {
+  struct FCBC * fcbc = cls;
+  fcbc->method(ctx,
+               fcbc->argument);
+  return NULL;
+}
+
 /**
  * This method is called when the user clicks on either
  * the "CLOSE" button (at the bottom of the search page)
@@ -599,6 +612,7 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
 void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
+  struct FCBC fcbc;
 
   list = search_head;
   while (list != NULL) {
@@ -608,8 +622,10 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  FSUI_stopSearch(ctx,
-                  list->fsui_list);
+  fcbc.method = &FSUI_stopSearch;
+  fcbc.argument = list->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 /**
@@ -635,15 +651,19 @@ static void stopSearch(GtkTreeModel * model,
                        GtkTreeIter * iter,
                        gpointer unused) {
   SearchList * s;
+  struct FCBC fcbc;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL)
-    FSUI_stopSearch(ctx,
-                    s->fsui_list);
+  if (s != NULL) {
+    fcbc.method = &FSUI_stopSearch;
+    fcbc.argument = s->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**
@@ -665,15 +685,19 @@ static void abortSearch(GtkTreeModel * model,
                         GtkTreeIter * iter,
                         gpointer unused) {
   SearchList * s;
+  struct FCBC fcbc;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL)
-    FSUI_abortSearch(ctx,
-                     s->fsui_list);
+  if (s != NULL) {
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = s->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**