Catch a second location

ppy · Jun 29, 2022 · 6c64cea · 6c64cea
1 parent b092e69
commit 6c64cea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/osu.Game/Overlays/Settings/SettingsFooter.cs b/osu.Game/Overlays/Settings/SettingsFooter.cs
@@ -8,6 +8,7 @@
 using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -32,16 +33,23 @@ private void load(OsuGameBase game, RulesetStore rulesets)
 
             foreach (var ruleset in rulesets.AvailableRulesets)
             {
-                var icon = new ConstrainedIconContainer
+                try
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Icon = ruleset.CreateInstance().CreateIcon(),
-                    Colour = Color4.Gray,
-                    Size = new Vector2(20),
-                };
+                    var icon = new ConstrainedIconContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Icon = ruleset.CreateInstance().CreateIcon(),
+                        Colour = Color4.Gray,
+                        Size = new Vector2(20),
+                    };
 
-                modes.Add(icon);
+                    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);
+                }
             }
 
             Children = new Drawable[]

diff --git a/osu.Game/Rulesets/RulesetSelector.cs b/osu.Game/Rulesets/RulesetSelector.cs
@@ -19,15 +19,15 @@ public abstract class RulesetSelector : TabControl<RulesetInfo>
         [BackgroundDependencyLoader]
         private void load()
         {
-            foreach (var r in Rulesets.AvailableRulesets)
+            foreach (var ruleset in Rulesets.AvailableRulesets)
             {
                 try
                 {
-                    AddItem(r);
+                    AddItem(ruleset);
                 }
                 catch
                 {
-                    Logger.Log($"Could not create ruleset icon for {r.Name}. Please check for an update.", level: LogLevel.Error);
+                    Logger.Log($"Could not create ruleset icon for {ruleset.Name}. Please check for an update from the developer.", level: LogLevel.Error);
                 }
             }
         }