-corrected peer_is_live() checking

1 files changed, 11 insertions, 6 deletions

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index b0551df37..889f7b658 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -615,6 +615,13 @@ peer_is_live (struct PeerContext *peer_ctx)
 {
   struct GNUNET_PeerIdentity *peer;
 
+  /* Cancle is_live_task if still scheduled */
+  if (NULL != peer_ctx->is_live_task)
+  {
+    GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
+    peer_ctx->is_live_task = NULL;
+  }
+
   peer = &peer_ctx->peer_id;
   set_peer_flag (peer_ctx, VALID);
 
@@ -629,12 +636,6 @@ peer_is_live (struct PeerContext *peer_ctx)
     GNUNET_array_grow (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, 0);
   }
 
-  if (NULL != peer_ctx->is_live_task)
-  {
-    GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
-    peer_ctx->is_live_task = NULL;
-  }
-
   return 0;
 }
 
@@ -1792,7 +1793,11 @@ peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
                          0);
 
     if (NULL != peer_ctx->mq)
+    {
       GNUNET_MQ_destroy (peer_ctx->mq);
+      peer_ctx->mq = NULL;
+    }
+
 
     if (NULL != peer_ctx->is_live_task)
     {