From e7f47c635fdbad79b71831e8d4b86b0708138440 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 19:00:04 +0900
Subject: [PATCH] Fix gameplay mouse cursor being overridden by menu cursor

Closes https://github.com/ppy/osu/issues/12313.
---
 osu.Game/OsuGameBase.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b2bbd0b48b..21313d0596 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -308,17 +308,15 @@ namespace osu.Game
 
             AddInternal(RulesetConfigCache);
 
-            MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
-
-            GlobalInputManager globalInput;
-
-            MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
+            var globalInput = new GlobalInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
+                Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
             };
 
-            base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
+            MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
+
+            base.Content.Add(CreateScalingContainer().WithChild(globalInput));
 
             KeyBindingStore.Register(globalInput.GlobalBindings);
             dependencies.Cache(globalInput.GlobalBindings);