[GNUnet-SVN] r27609 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2013-06-26 11:34:13 +0200 (Wed, 26 Jun 2013)
New Revision: 27609

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
Log:
-do not schedule kill task twice on error

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2013-06-26 08:21:32 UTC 
(rev 27608)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2013-06-26 09:34:13 UTC 
(rev 27609)
@@ -1432,8 +1432,11 @@
   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 @@
     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:
     {