From: Nathan S. Evans <evans@in.tum.de>
Date: Thu, 16 Jun 2011 14:03:28 +0000 (+0000)
Subject: fix for assertion failure on topology daemon shutdown
X-Git-Tag: initial-import-from-subversion-38251~18124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ead465b28ee163e0901c795ac9ce8749286000ba;p=oweals%2Fgnunet.git

fix for assertion failure on topology daemon shutdown
---

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index f7118a058..4e8f1c36d 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -1317,8 +1317,11 @@ hello_advertising_ready (void *cls,
 				1,
 				GNUNET_NO);    
     }
+
+  if (pl->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel(pl->hello_delay_task);
   pl->next_hello_allowed = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
-  pl->hello_delay_task 
+  pl->hello_delay_task
     = GNUNET_SCHEDULER_add_now (&schedule_next_hello,
 				pl);
   return want;