From a15653c77cf79c1a6fc8628979d30c2dbb95492e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:15:57 +0900
Subject: [PATCH 1/3] Fix potential hard crash if ruleset settings fail to
 construct

---
 .../Overlays/Settings/Sections/GameplaySection.cs  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index aca507f20a..c09e3a227d 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -1,12 +1,14 @@
 // 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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
 using osu.Game.Rulesets;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Logging;
 
 namespace osu.Game.Overlays.Settings.Sections
 {
@@ -35,8 +37,18 @@ namespace osu.Game.Overlays.Settings.Sections
             foreach (Ruleset ruleset in rulesets.AvailableRulesets.Select(info => info.CreateInstance()))
             {
                 SettingsSubsection section = ruleset.CreateSettings();
+
                 if (section != null)
-                    Add(section);
+                {
+                    try
+                    {
+                        Add(section);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $"Failed to load ruleset settings");
+                    }
+                }
             }
         }
     }

From 644f3375ac2210428cf7dfbd8afb58fb9e0dd0aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:28:19 +0900
Subject: [PATCH 2/3] Also catch exceptions in the construction call

---
 .../Settings/Sections/GameplaySection.cs       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index c09e3a227d..f76b8e085b 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -36,18 +36,16 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             foreach (Ruleset ruleset in rulesets.AvailableRulesets.Select(info => info.CreateInstance()))
             {
-                SettingsSubsection section = ruleset.CreateSettings();
-
-                if (section != null)
+                try
                 {
-                    try
-                    {
+                    SettingsSubsection section = ruleset.CreateSettings();
+
+                    if (section != null)
                         Add(section);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error(e, $"Failed to load ruleset settings");
-                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, $"Failed to load ruleset settings");
                 }
             }
         }

From ab057e6c654886d961b5abd7b2bdd795a93ed28f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Sep 2020 16:28:35 +0900
Subject: [PATCH 3/3] Remove unnecessary string interpolation

---
 osu.Game/Overlays/Settings/Sections/GameplaySection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index f76b8e085b..e5cebd28e2 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 }
                 catch (Exception e)
                 {
-                    Logger.Error(e, $"Failed to load ruleset settings");
+                    Logger.Error(e, "Failed to load ruleset settings");
                 }
             }
         }