1 files changed, 3 insertions, 2 deletions

diff --git a/src/transport/transport_api_new.c b/src/transport/transport_api_new.c
index 6d508f0f8..1018cff31 100644
--- a/src/transport/transport_api_new.c
+++ b/src/transport/transport_api_new.c
@@ -1340,13 +1340,14 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
               "Transport disconnect called!\n");
 #endif
   /* this disconnects all neighbours... */
-  disconnect_and_schedule_reconnect (handle);
+  if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+    disconnect_and_schedule_reconnect (handle);
   /* and now we stop trying to connect again... */
   if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
     {
       GNUNET_SCHEDULER_cancel (handle->reconnect_task);
       handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+    }  
   GNUNET_CONTAINER_multihashmap_destroy (handle->neighbours);
   handle->neighbours = NULL;
   if (handle->quota_task != GNUNET_SCHEDULER_NO_TASK)