[GNUnet-SVN] r19276 - gnunet/src/vpn

[gnunet]

Author: grothoff
Date: 2012-01-20 09:35:39 +0100 (Fri, 20 Jan 2012)
New Revision: 19276

Modified:
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
-partial fix to #2090

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2012-01-20 08:26:46 UTC (rev 19275)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2012-01-20 08:35:39 UTC (rev 19276)
@@ -512,11 +512,6 @@
   GNUNET_STATISTICS_update (stats,
                            gettext_noop ("# Active tunnels"),
                            -1, GNUNET_NO);
-  if (GNUNET_SCHEDULER_NO_TASK != ts->destroy_task)
-  {
-    GNUNET_SCHEDULER_cancel (ts->destroy_task);
-    ts->destroy_task = GNUNET_SCHEDULER_NO_TASK;
-  }
   while (NULL != (tnq = ts->tmq_head))
   {
     GNUNET_CONTAINER_DLL_remove (ts->tmq_head,
@@ -542,6 +537,11 @@
     ts->tunnel = NULL;
     GNUNET_MESH_tunnel_destroy (tunnel);
   }
+  if (GNUNET_SCHEDULER_NO_TASK != ts->destroy_task)
+  {
+    GNUNET_SCHEDULER_cancel (ts->destroy_task);
+    ts->destroy_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (NULL != ts->heap_node)
   {
     GNUNET_CONTAINER_heap_remove_node (ts->heap_node);