1 files changed, 15 insertions, 6 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 3defe98f..5abbd3ae 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -413,15 +413,14 @@ void on_clearCompletedDownloadsButton_clicked(void * unused,
                                NULL);
 }
 
-static void abortDownloadCallback(GtkTreeModel * model,
-                                  GtkTreePath * path,
-                                  GtkTreeIter * iter,
-                                  GtkTreeStore * tree) {
+static void * shutdownCode(void * it) {
+  GtkTreeModel * model;
+  GtkTreeIter * iter = it; 
   struct ECRS_URI * u;
   char * fn;
 
-  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
-  gtk_tree_model_get(GTK_TREE_MODEL(summary),
+  model = GTK_TREE_MODEL(summary);
+  gtk_tree_model_get(model,
                      iter,
                      DOWNLOAD_URI, &u,
                      DOWNLOAD_FILENAME, &fn,
@@ -433,6 +432,16 @@ static void abortDownloadCallback(GtkTreeModel * model,
                         iter);
   if (u != NULL)
     ECRS_freeUri(u);  
+  return NULL;
+}
+
+static void abortDownloadCallback(GtkTreeModel * model,
+                                  GtkTreePath * path,
+                                  GtkTreeIter * iter,
+                                  GtkTreeStore * tree) {
+  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
+  run_with_save_calls(&shutdownCode,
+                      iter);
 }
 
 void on_abortDownloadButton_clicked(void * unused,