From 15480c006b6353620b64dce0affcb935d935e3a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:30 +0900
Subject: [PATCH] Create the correct room subscreen

---
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs            | 6 ++++--
 .../Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs    | 4 ++++
 .../Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs     | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index f4591d089e..44c893363b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Match;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
@@ -192,9 +192,11 @@ namespace osu.Game.Screens.Multi.Lounge
 
             selectedRoom.Value = room;
 
-            this.Push(new TimeshiftRoomSubScreen(room));
+            this.Push(CreateRoomSubScreen(room));
         }
 
         protected abstract FilterControl CreateFilterControl();
+
+        protected abstract RoomSubScreen CreateRoomSubScreen(Room room);
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
index ed187e436f..9fbf0c4654 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
     public class RealtimeLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
index 70fb1aef1d..8e426ffbcc 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Timeshift
 {
     public class TimeshiftLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new TimeshiftRoomSubScreen(room);
     }
 }