From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Apr 2012 12:51:16 +0000 (+0000)
Subject: -fix
X-Git-Tag: initial-import-from-subversion-38251~13803
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=719f459ee3694e4cadf491a18b4f98ea2c412a42;p=oweals%2Fgnunet.git

-fix
---

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index e7860ac94..a9dbd3573 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -1186,11 +1186,6 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_PEERINFO_notify_cancel (peerinfo_notify);
     peerinfo_notify = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != add_task)
-  {
-    GNUNET_SCHEDULER_cancel (add_task);
-    add_task = GNUNET_SCHEDULER_NO_TASK;
-  }
   GNUNET_TRANSPORT_disconnect (transport);
   transport = NULL;
   if (handle != NULL)
@@ -1199,6 +1194,11 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     handle = NULL;
   }
   whitelist_peers ();
+  if (GNUNET_SCHEDULER_NO_TASK != add_task)
+  {
+    GNUNET_SCHEDULER_cancel (add_task);
+    add_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_CONTAINER_multihashmap_iterate (peers, &free_peer, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (peers);
   peers = NULL;