From 63f349876290a3d5c07768e75116ae132dbbc2ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Feb 2023 15:11:33 +0900
Subject: [PATCH] Restructure `UseResumeOverlay` to correctly handle a value
 change before BDL load

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 23e8d1fc2d..c839062875 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -194,13 +194,16 @@ namespace osu.Game.Rulesets.UI
 
             Audio = audioContainer;
 
-            if ((ResumeOverlay = CreateResumeOverlay()) != null)
+            if (UseResumeOverlay)
             {
-                UseResumeOverlay = true;
-
-                AddInternal(CreateInputManager()
-                    .WithChild(CreatePlayfieldAdjustmentContainer()
-                        .WithChild(ResumeOverlay)));
+                if ((ResumeOverlay = CreateResumeOverlay()) == null)
+                    UseResumeOverlay = false;
+                else
+                {
+                    AddInternal(CreateInputManager()
+                        .WithChild(CreatePlayfieldAdjustmentContainer()
+                            .WithChild(ResumeOverlay)));
+                }
             }
 
             applyRulesetMods(Mods, config);
@@ -512,8 +515,8 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Whether the <see cref="ResumeOverlay"/> should be used to return the user's cursor position to its previous location after a pause.
         /// </summary>
-        /// <remarks>Defaults to <c>true</c> if a ruleset returns a non-null overlay via <see cref="CreateResumeOverlay"/>.</remarks>
-        public bool UseResumeOverlay { get; set; }
+        /// <remarks>Defaults to <c>true</c>, but will become <c>false</c> if the ruleset fails to return a non-null overlay via <see cref="CreateResumeOverlay"/>.</remarks>
+        public bool UseResumeOverlay { get; set; } = true;
 
         /// <summary>
         /// Returns first available <see cref="HitWindows"/> provided by a <see cref="HitObject"/>.