From d32bc1134d24bfedd3df91e2fadfdfeab088b997 Mon Sep 17 00:00:00 2001
From: N-Pex <npexdev@gmail.com>
Date: Thu, 25 Feb 2021 14:21:21 +0100
Subject: [PATCH] Fix stuck on room loading

For fresh account, when "/room" ("/join" worked). Issue #76.
---
 src/components/Chat.vue     |  4 +++-
 src/components/RoomInfo.vue | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index a61ed05..2a1e1dc 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -418,7 +418,9 @@ export default {
       return this.$matrix.currentRoom;
     },
     roomId() {
-      if (!this.$matrix.ready) {
+      if (!this.$matrix.ready && this.currentUser) {
+        // If we have a user already, wait for ready state. If not, we
+        // dont want to return here, because we want to redirect to "join".
         return null; // Not ready yet...
       }
       if (this.room) {
diff --git a/src/components/RoomInfo.vue b/src/components/RoomInfo.vue
index 6bbfaad..5f3fe50 100644
--- a/src/components/RoomInfo.vue
+++ b/src/components/RoomInfo.vue
@@ -52,7 +52,7 @@
     <v-card class="members ma-3" flat>
       <v-card-title class="h2"
         >Members<v-spacer></v-spacer>
-        <div>{{ room.getJoinedMemberCount() }}</div></v-card-title
+        <div>{{ memberCount }}</div></v-card-title
       >
       <v-card-text>
         <div
@@ -241,10 +241,9 @@ export default {
 
   watch: {
     room: {
-      handler(newVal, ignoredOldVal) {
+      handler(ignoredNewVal, ignoredOldVal) {
         console.log("RoomInfo: Current room changed");
-        this.memberCount = newVal.getJoinedMemberCount();
-
+        this.updateMemberCount();
         this.updateQRCode();
       },
     },
@@ -261,7 +260,11 @@ export default {
     },
 
     updateMemberCount() {
-      this.memberCount = this.room.getJoinedMemberCount();
+      if (this.room) {
+          this.memberCount = this.room.getJoinedMemberCount();
+        } else {
+          this.memberCount = null;
+        }
     },
 
     updateQRCode() {