From b1a732b9b7928d73d76db540e2feffece095aae2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Aug 2021 21:28:48 +0900
Subject: [PATCH] Remove selectedRoom from OnlinePlayScreen

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs |  4 +---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs       | 11 -----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 90e5a62d7e..e2a4f3dfdf 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -49,9 +49,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         protected ListingPollingComponent ListingPollingComponent { get; private set; }
 
-        [Resolved]
-        private Bindable<Room> selectedRoom { get; set; }
-
         [Resolved]
         private MusicController music { get; set; }
 
@@ -68,6 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         private LeasedBindable<Room> selectionLease;
 
         private readonly Bindable<FilterCriteria> filter = new Bindable<FilterCriteria>(new FilterCriteria());
+        private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
         private readonly IBindable<bool> operationInProgress = new Bindable<bool>();
         private readonly IBindable<bool> isIdle = new BindableBool();
         private LoadingLayer loadingLayer;
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 76815172e5..fc20b21b60 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -10,7 +10,6 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
-using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -38,9 +37,6 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached(Type = typeof(IRoomManager))]
         protected RoomManager RoomManager { get; private set; }
 
-        [Cached]
-        private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
-
         [Cached]
         private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
@@ -106,13 +102,6 @@ namespace osu.Game.Screens.OnlinePlay
             apiState.BindValueChanged(onlineStateChanged, true);
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
-            dependencies.Model.BindTo(selectedRoom);
-            return dependencies;
-        }
-
         private void forcefullyExit()
         {
             // This is temporary since we don't currently have a way to force screens to be exited