Merge pull request #8355 from peppy/fix-invalid-push-from-player

Fix potentially invalid push in player while already exiting

osu.Game/Screens/Play/Player.cs

@@ -387,6 +387,10 @@ namespace osu.Game.Screens.Play
 
         private void onCompletion()
         {
+            // screen may be in the exiting transition phase.
+            if (!this.IsCurrentScreen())
+                return;
+
             // Only show the completion screen if the player hasn't failed
             if (HealthProcessor.HasFailed || completionProgressDelegate != null)
                 return;
@@ -581,7 +585,7 @@ namespace osu.Game.Screens.Play
             if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
                 // proceed to result screen if beatmap already finished playing
-                scheduleGotoRanking();
+                completionProgressDelegate.RunTask();
                 return true;
             }
 
@@ -622,8 +626,16 @@ namespace osu.Game.Screens.Play
             completionProgressDelegate = Schedule(delegate
             {
                 var score = CreateScore();
+
                 if (DrawableRuleset.ReplayScore == null)
-                    scoreManager.Import(score).ContinueWith(_ => Schedule(() => this.Push(CreateResults(score))));
+                {
+                    scoreManager.Import(score).ContinueWith(_ => Schedule(() =>
+                    {
+                        // screen may be in the exiting transition phase.
+                        if (this.IsCurrentScreen())
+                            this.Push(CreateResults(score));
+                    }));
+                }
                 else
                     this.Push(CreateResults(score));
             });