multicast, psyc, psycstore, client_manager fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index ce663542d..5cd729203 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -267,7 +267,7 @@ group_recv_message (void *cls,
               "Calling message callback with a message of size %u.\n",
               ntohs (mmsg->header.size));
 
-  if (NULL != grp->message_cb)
+  if (GNUNET_YES != grp->is_disconnecting && NULL != grp->message_cb)
     grp->message_cb (grp->cb_cls, mmsg);
 }
 
@@ -848,7 +848,7 @@ GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *mem,
   grp->disconnect_cls = part_cls;
 
   GNUNET_CLIENT_MANAGER_disconnect (mem->grp.client, GNUNET_YES,
-                                    &member_cleanup, mem);
+                                    member_cleanup, mem);
 }