Merge pull request #13915 from bdach/fix-tourney-seeding-crash

Fix seeding screen crashing on seedings with null mod

osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs

@@ -1,9 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Ladder.Components;
 using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests.Screens
@@ -11,16 +15,41 @@ namespace osu.Game.Tournament.Tests.Screens
     public class TestSceneSeedingScreen : TournamentTestScene
     {
         [Cached]
-        private readonly LadderInfo ladder = new LadderInfo();
+        private readonly LadderInfo ladder = new LadderInfo
-
-        [BackgroundDependencyLoader]
-        private void load()
         {
-            Add(new SeedingScreen
+            Teams =
+            {
+                new TournamentTeam
+                {
+                    FullName = { Value = @"Japan" },
+                    Acronym = { Value = "JPN" },
+                    SeedingResults =
+                    {
+                        new SeedingResult
+                        {
+                            // Mod intentionally left blank.
+                            Seed = { Value = 4 }
+                        },
+                        new SeedingResult
+                        {
+                            Mod = { Value = "DT" },
+                            Seed = { Value = 8 }
+                        }
+                    }
+                }
+            }
+        };
+
+        [Test]
+        public void TestBasic()
+        {
+            AddStep("create seeding screen", () => Add(new SeedingScreen
             {
                 FillMode = FillMode.Fit,
                 FillAspectRatio = 16 / 9f
-            });
+            }));
+
+            AddStep("set team to Japan", () => this.ChildrenOfType<SettingsTeamDropdown>().Single().Current.Value = ladder.Teams.Single());
         }
     }
 }

osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs

@@ -181,21 +181,28 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 [BackgroundDependencyLoader]
                 private void load(TextureStore textures)
                 {
+                    FillFlowContainer row;
+
                     InternalChildren = new Drawable[]
                     {
-                        new FillFlowContainer
+                        row = new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(5),
-                            Children = new Drawable[]
+                        },
+                    };
+
+                    if (!string.IsNullOrEmpty(mods))
                     {
-                                new Sprite
+                        row.Add(new Sprite
                         {
                             Texture = textures.Get($"mods/{mods.ToLower()}"),
                             Scale = new Vector2(0.5f)
-                                },
+                        });
-                                new Container
+                    }
+
+                    row.Add(new Container
                     {
                         Size = new Vector2(50, 16),
                         CornerRadius = 10,
@@ -215,10 +222,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                                 Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
                             },
                         }
-                                },
+                    });
-                            }
-                        },
-                    };
                 }
             }
         }