From 01f795b0464757dec7e2f7edd57fc8c7025bd24f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Mar 2019 19:45:04 +0900
Subject: [PATCH] Make restart public rather than reimplementing

---
 osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs | 7 +------
 osu.Game/Screens/Play/Player.cs                          | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
index 5f5d84af42..6f7d465cfe 100644
--- a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
+++ b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
@@ -231,12 +231,7 @@ namespace osu.Game.Tests.Visual
         {
             performFullSetup();
             AddStep("Move mouse to Visual Settings", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos));
-            AddStep("Resume PlayerLoader", () =>
-            {
-                player.ValidForResume = false;
-                player.RestartRequested?.Invoke();
-                player.Exit();
-            });
+            AddStep("Resume PlayerLoader", () => player.Restart());
             waitForDim();
             AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1ce8bf559d..7071841722 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play
                 PausableGameplayContainer = new PausableGameplayContainer
                 {
                     Retries = RestartCount,
-                    OnRetry = restart,
+                    OnRetry = Restart,
                     OnQuit = performUserRequestedExit,
                     Start = gameplayClockContainer.Start,
                     Stop = gameplayClockContainer.Stop,
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Play
                 },
                 failOverlay = new FailOverlay
                 {
-                    OnRetry = restart,
+                    OnRetry = Restart,
                     OnQuit = performUserRequestedExit,
                 },
                 new HotkeyRetryOverlay
@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        restart();
+                        Restart();
                     },
                 }
             };
@@ -235,7 +235,7 @@ namespace osu.Game.Screens.Play
             this.Exit();
         }
 
-        private void restart()
+        public void Restart()
         {
             if (!this.IsCurrentScreen()) return;