From fdcb5e924c9153de2065731689d902d887652bca Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 17:45:38 -0400
Subject: [PATCH] Initialize skipOutroOverlay with alpha 0, other small changes

---
 osu.Game/Screens/Play/Player.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e998f33cc1..ef0caa2fa3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
                 skipIntroOverlay.Hide();
+                skipOutroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -368,7 +369,8 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = scheduleCompletion
+                        RequestSkip = scheduleCompletion,
+                        Alpha = 0
                     },
                     FailOverlay = new FailOverlay
                     {
@@ -416,8 +418,6 @@ namespace osu.Game.Screens.Play
                 });
             }
 
-            skipOutroOverlay.Hide();
-
             return container;
         }
 
@@ -539,13 +539,9 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                // show the score if in storyboard outro (score has been set)
-                bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted;
-
-                if (scoreReady)
-                {
+                // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
+                if (prepareScoreForDisplayTask != null)
                     scheduleCompletion();
-                }
             }
 
             this.Exit();
@@ -639,7 +635,6 @@ namespace osu.Game.Screens.Play
             if (storyboardHasOutro)
             {
                 skipOutroOverlay.Show();
-                completionProgressDelegate = null;
                 return;
             }