we were on the wood way

1 files changed, 9 insertions, 4 deletions

diff --git a/src/social/social_api.c b/src/social/social_api.c
index a190b2f26..4b3655de4 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -1062,6 +1062,8 @@ place_cleanup (struct GNUNET_SOCIAL_Place *plc)
   }
   if (NULL != plc->mq)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "destroying MQ (place_cleanup)\n");
     GNUNET_MQ_destroy (plc->mq);
     plc->mq = NULL;
   }
@@ -1085,11 +1087,10 @@ place_disconnect (struct GNUNET_SOCIAL_Place *plc)
               plc);
   if (NULL != plc->mq)
   {
-    //struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (plc->mq);
-    if (GNUNET_MQ_get_length (plc->mq) > 0)
+    struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (plc->mq);
+    if (NULL != env)
     {
-      struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (plc->mq);
-      GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback) place_disconnect, plc);
+      GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback) place_cleanup, plc);
     }
     else
     {
@@ -1151,6 +1152,8 @@ host_disconnected (void *cls, enum GNUNET_MQ_Error error)
   }
   if (NULL != plc->mq)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "destroying MQ (host_disconnected)\n");
     GNUNET_MQ_destroy (plc->mq);
     plc->mq = NULL;
   }
@@ -1659,6 +1662,8 @@ guest_disconnected (void *cls, enum GNUNET_MQ_Error error)
   }
   if (NULL != plc->mq)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "destroying MQ (guest_disconnected)\n");
     GNUNET_MQ_destroy (plc->mq);
     plc->mq = NULL;
   }