From 31a5cdd8ac3339ed680a948355c1087af3fa3fd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:02:21 +0900
Subject: [PATCH] Fix current selection not updating visually after creating a
 new playlist

---
 .../Lounge/Components/RoomsContainer.cs          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f70c33babe..40102b1693 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -69,8 +69,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             rooms.BindTo(roomManager.Rooms);
 
             filter?.BindValueChanged(criteria => Filter(criteria.NewValue));
+
+            selectedRoom.BindValueChanged(selection =>
+            {
+                updateSelection();
+            }, true);
         }
 
+        private void updateSelection() =>
+            roomFlow.Children.ForEach(r => r.State = r.Room == selectedRoom.Value ? SelectionState.Selected : SelectionState.NotSelected);
+
         public void Filter(FilterCriteria criteria)
         {
             roomFlow.Children.ForEach(r =>
@@ -125,6 +133,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             }
 
             Filter(filter?.Value);
+
+            updateSelection();
         }
 
         private void removeRooms(IEnumerable<Room> rooms)
@@ -146,11 +156,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 roomFlow.SetLayoutPosition(room, room.Room.Position.Value);
         }
 
-        private void selectRoom(Room room)
-        {
-            roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
-            selectedRoom.Value = room;
-        }
+        private void selectRoom(Room room) => selectedRoom.Value = room;
 
         private void joinSelected()
         {