-fixing #2139

1 files changed, 31 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 074a1ad1..0c609fdf 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -201,6 +201,11 @@ struct AddDirClientContext
   struct GNUNET_FS_DirScanner *ds;
 
   /**
+   * Task scheduled to stop the scanner on errors.
+   */
+  GNUNET_SCHEDULER_TaskIdentifier kill_task;
+
+  /**
    * Default options to use for sharing when adding files during the scan.
    */
   struct GNUNET_FS_BlockOptions directory_scan_bo;
@@ -905,6 +910,11 @@ static void
 destroy_progress_dialog (struct AddDirClientContext *adcc)
 {
   GNUNET_assert (NULL == adcc->ds);
+  if (GNUNET_SCHEDULER_NO_TASK != adcc->kill_task)
+  {
+    GNUNET_SCHEDULER_cancel (adcc->kill_task);
+    adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   gtk_widget_destroy (adcc->progress_dialog);
   g_object_unref (G_OBJECT (adcc->progress_dialog_builder));  
   GNUNET_CONTAINER_DLL_remove (adcc->ctx->adddir_head,
@@ -1087,6 +1097,26 @@ add_share_items_to_treestore (struct AddDirClientContext *adcc,
 
 
 /**
+ * Function called when the scanner had some trouble and we
+ * need to abort the scanning process (which we need to do 
+ * in a separate task).
+ *
+ * @param cls  progress dialog context of our window
+ * @param tc scheduler context, unused
+ */
+static void
+stop_scanner_task (void *cls,
+                   const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct AddDirClientContext *adcc = cls;
+ 
+  adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_FS_directory_scan_abort (adcc->ds);
+  adcc->ds = NULL;
+}
+
+
+/**
  * Progress callback called from the directory scanner with
  * information about our progress scanning the hierarchy.
  *
@@ -1174,8 +1204,7 @@ directory_scan_cb (void *cls,
     break;
   case GNUNET_FS_DIRSCANNER_INTERNAL_ERROR:
     insert_progress_dialog_text (adcc, _("Operation failed (press cancel)\n"));
-    GNUNET_FS_directory_scan_abort (adcc->ds);
-    adcc->ds = NULL;
+    adcc->kill_task = GNUNET_SCHEDULER_add_now (&stop_scanner_task, adcc);
     break;
   case GNUNET_FS_DIRSCANNER_FINISHED:
     {