From de2dac22b86fea188daa886a01e65adcf136e2cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Nov 2022 18:46:04 +0900
Subject: [PATCH] Ensure seeding screen is refreshed on entering

---
 .../Screens/TeamIntro/SeedingScreen.cs        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 9262cab098..8bc28e1068 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -70,16 +70,16 @@ private void load()
             currentTeam.BindValueChanged(teamChanged, true);
         }
 
-        private void teamChanged(ValueChangedEvent<TournamentTeam> team) => Scheduler.AddOnce(() =>
-        {
-            if (team.NewValue == null)
-            {
-                mainContainer.Clear();
-                return;
-            }
+        private void teamChanged(ValueChangedEvent<TournamentTeam> team) => updateTeamDisplay();
 
-            showTeam(team.NewValue);
-        });
+        public override void Show()
+        {
+            base.Show();
+
+            // Changes could have been made on editor screen.
+            // Rather than trying to track all the possibilities (teams / players / scores) just force a full refresh.
+            updateTeamDisplay();
+        }
 
         protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
         {
@@ -91,14 +91,20 @@ protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> m
             currentTeam.Value = match.NewValue.Team1.Value;
         }
 
-        private void showTeam(TournamentTeam team)
+        private void updateTeamDisplay() => Scheduler.AddOnce(() =>
         {
+            if (currentTeam.Value == null)
+            {
+                mainContainer.Clear();
+                return;
+            }
+
             mainContainer.Children = new Drawable[]
             {
-                new LeftInfo(team) { Position = new Vector2(55, 150), },
-                new RightInfo(team) { Position = new Vector2(500, 150), },
+                new LeftInfo(currentTeam.Value) { Position = new Vector2(55, 150), },
+                new RightInfo(currentTeam.Value) { Position = new Vector2(500, 150), },
             };
-        }
+        });
 
         private class RightInfo : CompositeDrawable
         {