-misc minor bugfixes

2 files changed, 6 insertions, 2 deletions

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 715d107f0..0ad85131c 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -272,6 +272,8 @@ handle_phone_hangup (void *cls,
     phone->event_handler (phone->event_handler_cls,
                           GNUNET_CONVERSATION_EC_TERMINATED,
                           reason);
+    phone->speaker->disable_speaker (phone->speaker->cls);
+    phone->mic->disable_microphone (phone->mic->cls);
     break;
   }
 }
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index d379931f7..2bb7caea7 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -223,11 +223,11 @@ handle_client_register_message (void *cls,
   line = GNUNET_new (struct Line);
   line->client = client;
   GNUNET_SERVER_notification_context_add (nc, client);
+  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_CONTAINER_DLL_insert (lines_head,
                                lines_tail,
                                line);
   line->local_line = ntohl (msg->line);
-  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -478,6 +478,9 @@ handle_client_call_message (void *cls,
     return;
   }
   line = GNUNET_new (struct Line);
+  line->client = client;
+  GNUNET_SERVER_client_set_user_context (client, line);
+  GNUNET_SERVER_notification_context_add (nc, client);
   line->target = msg->target;
   GNUNET_CONTAINER_DLL_insert (lines_head,
                                lines_tail,
@@ -509,7 +512,6 @@ handle_client_call_message (void *cls,
                           &ring->purpose,
                           &ring->signature);
   GNUNET_MQ_send (line->reliable_mq, e);
-  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }