1 files changed, 9 insertions, 10 deletions

diff --git a/src/gnunet_chat_handle_intern.c b/src/gnunet_chat_handle_intern.c
index 10bea17..beb65d3 100644
--- a/src/gnunet_chat_handle_intern.c
+++ b/src/gnunet_chat_handle_intern.c
@@ -364,8 +364,16 @@ on_handle_identity(void *cls,
       (0 < GNUNET_CONTAINER_multishortmap_size(handle->contacts)))
     return;
 
+  GNUNET_MESSENGER_find_rooms(
+      handle->messenger, NULL, find_handle_rooms, handle
+  );
+
+  GNUNET_MESSENGER_find_rooms(
+      handle->messenger, NULL, scan_handle_rooms, handle
+  );
+
   if (!handle->msg_cb)
-    goto skip_login;
+    return;
 
   struct GNUNET_CHAT_Message *msg = message_create_internally(
       NULL, GNUNET_CHAT_FLAG_LOGIN, NULL
@@ -373,15 +381,6 @@ on_handle_identity(void *cls,
 
   handle->msg_cb(handle->msg_cls, NULL, msg);
   message_destroy(msg);
-
-skip_login:
-  GNUNET_MESSENGER_find_rooms(
-      handle->messenger, NULL, find_handle_rooms, handle
-  );
-
-  GNUNET_MESSENGER_find_rooms(
-      handle->messenger, NULL, scan_handle_rooms, handle
-  );
 }
 
 void