Ensure icon is loaded inside try-catch

ppy · Jun 29, 2022 · 87e3b44 · 87e3b44
1 parent e3eba58
commit 87e3b44
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/osu.Game/Overlays/Settings/SettingsFooter.cs b/osu.Game/Overlays/Settings/SettingsFooter.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Development;
 using osu.Framework.Graphics;
@@ -29,39 +28,17 @@ private void load(OsuGameBase game, RulesetStore rulesets)
             Direction = FillDirection.Vertical;
             Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = SettingsPanel.CONTENT_MARGINS };
 
-            var modes = new List<Drawable>();
-
-            foreach (var ruleset in rulesets.AvailableRulesets)
-            {
-                try
-                {
-                    var icon = new ConstrainedIconContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Icon = ruleset.CreateInstance().CreateIcon(),
-                        Colour = Color4.Gray,
-                        Size = new Vector2(20),
-                    };
-
-                    modes.Add(icon);
-                }
-                catch
-                {
-                    Logger.Log($"Could not create ruleset icon for {ruleset.Name}. Please check for an update from the developer.", level: LogLevel.Error);
-                }
-            }
+            FillFlowContainer modes;
 
             Children = new Drawable[]
             {
-                new FillFlowContainer
+                modes = new FillFlowContainer
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Direction = FillDirection.Full,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Children = modes,
                     Spacing = new Vector2(5),
                     Padding = new MarginPadding { Bottom = 10 },
                 },
@@ -78,6 +55,27 @@ private void load(OsuGameBase game, RulesetStore rulesets)
                     Origin = Anchor.TopCentre,
                 }
             };
+
+            foreach (var ruleset in rulesets.AvailableRulesets)
+            {
+                try
+                {
+                    var icon = new ConstrainedIconContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Icon = ruleset.CreateInstance().CreateIcon(),
+                        Colour = Color4.Gray,
+                        Size = new Vector2(20),
+                    };
+
+                    modes.Add(icon);
+                }
+                catch
+                {
+                    Logger.Log($"Could not create ruleset icon for {ruleset.Name}. Please check for an update from the developer.", level: LogLevel.Error);
+                }
+            }
         }
 
         private class BuildDisplay : OsuAnimatedButton