From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 1 Apr 2012 17:59:40 +0000 (+0000)
Subject: -fix
X-Git-Tag: initial-import-from-subversion-38251~14037
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff75fee8db5fa41b951bce6fdc109ea901679c70;p=oweals%2Fgnunet.git

-fix
---

diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 028c93fe7..0cc3521ac 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -1286,7 +1286,11 @@ GSC_KX_handle_pong (struct GSC_KeyExchangeInfo *kx,
 static void
 send_key (struct GSC_KeyExchangeInfo *kx)
 {
-  GNUNET_assert (kx->retry_set_key_task == GNUNET_SCHEDULER_NO_TASK);
+  if (kx->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+     GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
+     kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (KX_STATE_UP == kx->status)
     return;                     /* nothing to do */
   if (kx->public_key == NULL)