From b298fe671bbe804b63e5aedfc7f2bf8d4a3fd2f9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 20 Jan 2012 08:35:39 +0000 Subject: [PATCH] -partial fix to #2090 --- src/vpn/gnunet-service-vpn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 8a4e308bf..95b8dd24b 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c @@ -512,11 +512,6 @@ free_tunnel_state (struct TunnelState *ts) 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 @@ free_tunnel_state (struct TunnelState *ts) 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); -- 2.25.1