From 04b874bb009a85b67c5783f30aa4a6f2bfb6862a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jul 2021 17:02:33 +0900
Subject: [PATCH] Add flow for submitting score on exiting `SubmittingPlayer`

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 60 ++++++++++++++---------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 2ee116a6a3..bbb6a21f39 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        private TaskCompletionSource<bool> scoreSubmissionSource;
+
         protected SubmittingPlayer(PlayerConfiguration configuration = null)
             : base(configuration)
         {
@@ -102,36 +104,18 @@ namespace osu.Game.Screens.Play
         /// <returns>Whether gameplay should be immediately exited as a result. Returning false allows the gameplay session to continue. Defaults to true.</returns>
         protected virtual bool HandleTokenRetrievalFailure(Exception exception) => true;
 
-        public override bool OnExiting(IScreen next)
-        {
-            return base.OnExiting(next);
-        }
-
         protected override async Task PrepareScoreForResultsAsync(Score score)
         {
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
-            // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
-            if (token == null)
-                return;
+            await submitScore(score).ConfigureAwait(false);
+        }
 
-            var tcs = new TaskCompletionSource<bool>();
-            var request = CreateSubmissionRequest(score, token.Value);
+        public override bool OnExiting(IScreen next)
+        {
+            submitScore(Score);
 
-            request.Success += s =>
-            {
-                score.ScoreInfo.OnlineScoreID = s.ID;
-                tcs.SetResult(true);
-            };
-
-            request.Failure += e =>
-            {
-                Logger.Error(e, "Failed to submit score");
-                tcs.SetResult(false);
-            };
-
-            api.Queue(request);
-            await tcs.Task.ConfigureAwait(false);
+            return base.OnExiting(next);
         }
 
         /// <summary>
@@ -148,5 +132,33 @@ namespace osu.Game.Screens.Play
         /// <param name="score">The score to be submitted.</param>
         /// <param name="token">The submission token.</param>
         protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
+
+        private Task submitScore(Score score)
+        {
+            // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
+            if (token == null)
+                return Task.CompletedTask;
+
+            if (scoreSubmissionSource != null)
+                return scoreSubmissionSource.Task;
+
+            scoreSubmissionSource = new TaskCompletionSource<bool>();
+            var request = CreateSubmissionRequest(score, token.Value);
+
+            request.Success += s =>
+            {
+                score.ScoreInfo.OnlineScoreID = s.ID;
+                scoreSubmissionSource.SetResult(true);
+            };
+
+            request.Failure += e =>
+            {
+                Logger.Error(e, "Failed to submit score");
+                scoreSubmissionSource.SetResult(false);
+            };
+
+            api.Queue(request);
+            return scoreSubmissionSource.Task;
+        }
     }
 }