From 77607c06eba37de48cb0670a4e7e09d9a9c8e4ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 22:07:39 +0900
Subject: [PATCH] Fix not being able to enter gameplay in TestSceneMultiplayer

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index bb5db5b803..78bc51e47b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -9,12 +9,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayer : ScreenTestScene
     {
+        private TestMultiplayer multiplayerScreen;
+
         public TestSceneMultiplayer()
         {
-            var multi = new TestMultiplayer();
+            AddStep("show", () =>
+            {
+                multiplayerScreen = new TestMultiplayer();
 
-            AddStep("show", () => LoadScreen(multi));
-            AddUntilStep("wait for loaded", () => multi.IsLoaded);
+                // Needs to be added at a higher level since the multiplayer screen becomes non-current.
+                Child = multiplayerScreen.Client;
+
+                LoadScreen(multiplayerScreen);
+            });
+
+            AddUntilStep("wait for loaded", () => multiplayerScreen.IsLoaded);
         }
 
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
@@ -24,7 +33,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public TestMultiplayer()
             {
-                AddInternal(Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager));
+                Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager);
             }
 
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();