From 73d266fe1041f7c56571f241a558de29ade43b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 Mar 2019 16:32:11 +0900
Subject: [PATCH] Fix win screen being incorrectly displayed after switching
 matches

---
 .../Screens/Gameplay/GameplayScreen.cs            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index eb33c2fbdb..2b6d16505a 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -120,7 +120,12 @@ namespace osu.Game.Tournament.Screens.Gameplay
             State.BindTo(ipc.State);
             State.BindValueChanged(stateChanged, true);
 
-            currentMatch.BindValueChanged(m => warmup.Value = m.NewValue.Team1Score.Value + m.NewValue.Team2Score.Value == 0);
+            currentMatch.BindValueChanged(m =>
+            {
+                warmup.Value = m.NewValue.Team1Score.Value + m.NewValue.Team2Score.Value == 0;
+                scheduledOperation?.Cancel();
+            });
+
             currentMatch.BindTo(ladder.CurrentMatch);
 
             warmup.BindValueChanged(w => warmupButton.Alpha = !w.NewValue ? 0.5f : 1, true);
@@ -172,12 +177,16 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     case TourneyState.Idle:
                         contract();
 
+                        const float delay_before_progression = 4000;
+
+                        // if we've returned to idle and the last screen was ranking
+                        // we should automatically proceed after a short delay
                         if (lastState == TourneyState.Ranking && !warmup.Value)
                         {
                             if (currentMatch.Value?.Completed.Value == true)
-                                scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, 4000);
+                                scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, delay_before_progression);
                             else if (currentMatch.Value?.Completed.Value == false)
-                                scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(MapPoolScreen)); }, 4000);
+                                scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(MapPoolScreen)); }, delay_before_progression);
                         }
 
                         break;