Merge pull request #24 from syonfoppen/fix-buggy-user-stuff

Fix buggy user stuff
syonfoppen · Mar 11, 2024 · 24c7c24 · 24c7c24
2 parents 04fe173 + c568fd3
commit 24c7c24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Estiblazor.UI/Estiblazor.UI/Components/Pages/Rooms.razor b/src/Estiblazor.UI/Estiblazor.UI/Components/Pages/Rooms.razor
@@ -48,11 +48,9 @@
 
             @foreach (var user in Room.Users)
             {
-                <UserChoicesView RoomName="@Room.Name" UserId="@user.Id" />
+                <UserChoicesView @key=@user.Id RoomName="@Room.Name" UserId="@user.Id" />
             }
 
-
-
     </div>
 </div>
 
@@ -114,6 +112,5 @@
     public void Dispose()
     {
         Room.PropertyChanged -= Room_PropertyChanged;
-        Room.RemoveUser(User);
     }
 }
diff --git a/src/Estiblazor.UI/Estiblazor.UI/Services/Users/User.cs b/src/Estiblazor.UI/Estiblazor.UI/Services/Users/User.cs
@@ -40,6 +40,7 @@ public void DecreaseOnline()
 
         public void SetRoom(RoomViewModel? room)
         {
+            if (CurrentRoom == room) return;
             CurrentRoom?.RemoveUser(this);
             CurrentRoom = room;
             CurrentRoom?.AddUser(this);