-cleaner

diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index f82e8f793f73651584e9fdc7ea240aebe2104d79..175397c785321799766be174318819477bbb9acb 100644 (file)
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -525,15 +525,13 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
          "Received end of list of peers from `%s' service\n", "PEERINFO");
     GNUNET_PEERINFO_iterate_cancel (ic);
     trigger_transmit (h);
-    if (GNUNET_NO == h->in_receive)
+    if ( (GNUNET_NO == h->in_receive) &&
+        (NULL != h->ic_head) )
     {
-      if (NULL != h->ic_head)
-      {
-       h->in_receive = GNUNET_YES;
-        GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
-                              GNUNET_TIME_absolute_get_remaining (h->ic_head->timeout));
-      }
-    }
+      h->in_receive = GNUNET_YES;
+      GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
+                            GNUNET_TIME_absolute_get_remaining (h->ic_head->timeout));
+    }    
     if (NULL != cb)
       cb (cb_cls, NULL, NULL, NULL);
     return;