1 files changed, 10 insertions, 2 deletions

diff --git a/src/util/helper.c b/src/util/helper.c
index c89f1ecb5..4187b819c 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -276,8 +276,16 @@ GNUNET_HELPER_wait (struct GNUNET_HELPER_Handle *h)
 static void
 stop_helper (struct GNUNET_HELPER_Handle *h, int soft_kill)
 {
-  GNUNET_break (GNUNET_OK == GNUNET_HELPER_kill (h, soft_kill));
-  GNUNET_break (GNUNET_OK == GNUNET_HELPER_wait (h));
+  if (GNUNET_SCHEDULER_NO_TASK != h->restart_task)
+  {
+    GNUNET_SCHEDULER_cancel (h->restart_task);
+    h->restart_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  else
+  {
+    GNUNET_break (GNUNET_OK == GNUNET_HELPER_kill (h, soft_kill));
+    GNUNET_break (GNUNET_OK == GNUNET_HELPER_wait (h));
+  }
 }