1 files changed, 8 insertions, 3 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index aec3521e..251509cb 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1432,8 +1432,11 @@ stop_scanner_task (void *cls,
   struct AddDirClientContext *adcc = cls;
  
   adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_FS_directory_scan_abort (adcc->ds);
-  adcc->ds = NULL;
+  if (NULL != adcc->ds)
+    {
+      GNUNET_FS_directory_scan_abort (adcc->ds);
+      adcc->ds = NULL;
+    }
 }
 
 
@@ -1525,7 +1528,9 @@ directory_scan_cb (void *cls,
     break;
   case GNUNET_FS_DIRSCANNER_INTERNAL_ERROR:
     insert_progress_dialog_text (adcc, _("Operation failed (press cancel)\n"));
-    adcc->kill_task = GNUNET_SCHEDULER_add_now (&stop_scanner_task, adcc);
+    if ( (NULL != adcc->ds) &&
+         (GNUNET_SCHEDULER_NO_TASK == adcc->kill_task) )
+      adcc->kill_task = GNUNET_SCHEDULER_add_now (&stop_scanner_task, adcc);
     break;
   case GNUNET_FS_DIRSCANNER_FINISHED:
     {