From 3a1154c00e85c834789d2e4772d0efc8017c1ba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Aug 2021 16:40:39 +0900
Subject: [PATCH] Pass room into SelectionPollingComponent

---
 .../Components/SelectionPollingComponent.cs   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 88d9469f8c..0769d0747b 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -3,7 +3,6 @@
 
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
@@ -13,20 +12,14 @@ namespace osu.Game.Screens.OnlinePlay.Components
     /// </summary>
     public class SelectionPollingComponent : RoomPollingComponent
     {
-        [Resolved]
-        private Bindable<Room> selectedRoom { get; set; }
-
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        private readonly Room room;
+
+        public SelectionPollingComponent(Room room)
         {
-            selectedRoom.BindValueChanged(_ =>
-            {
-                if (IsLoaded)
-                    PollImmediately();
-            });
+            this.room = room;
         }
 
         private GetRoomRequest pollReq;
@@ -36,13 +29,13 @@ namespace osu.Game.Screens.OnlinePlay.Components
             if (!API.IsLoggedIn)
                 return base.Poll();
 
-            if (selectedRoom.Value?.RoomID.Value == null)
+            if (room.RoomID.Value == null)
                 return base.Poll();
 
             var tcs = new TaskCompletionSource<bool>();
 
             pollReq?.Cancel();
-            pollReq = new GetRoomRequest(selectedRoom.Value.RoomID.Value.Value);
+            pollReq = new GetRoomRequest(room.RoomID.Value.Value);
 
             pollReq.Success += result =>
             {