From bb0f2124480ef35736b3aef4a5562e7058260991 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 5 Jul 2022 00:38:18 +0200
Subject: [PATCH 1/2] Trigger the initial cookie with midi and joysticks

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 74be02728f..fadc80277a 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -205,6 +205,28 @@ namespace osu.Game.Screens.Menu
             return base.OnKeyDown(e);
         }
 
+        protected override bool OnJoystickPress(JoystickPressEvent e)
+        {
+            if (State == ButtonSystemState.Initial)
+            {
+                logo?.TriggerClick();
+                return true;
+            }
+
+            return base.OnJoystickPress(e);
+        }
+
+        protected override bool OnMidiDown(MidiDownEvent e)
+        {
+            if (State == ButtonSystemState.Initial)
+            {
+                logo?.TriggerClick();
+                return true;
+            }
+
+            return base.OnMidiDown(e);
+        }
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             if (e.Repeat)

From 4c3789ec5d67422459154fc452d2a320706ee793 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 5 Jul 2022 11:15:37 +0200
Subject: [PATCH 2/2] Split into a function

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index fadc80277a..04bffda81b 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -191,38 +191,44 @@ namespace osu.Game.Screens.Menu
                 State = ButtonSystemState.Initial;
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
+        /// <summary>
+        /// Triggers the <see cref="logo"/> if the current <see cref="State"/> is <see cref="ButtonSystemState.Initial"/>.
+        /// </summary>
+        /// <returns><c>true</c> if the <see cref="logo"/> was triggered, <c>false</c> otherwise.</returns>
+        private bool triggerInitialOsuLogo()
         {
-            if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed || e.SuperPressed)
-                return false;
-
             if (State == ButtonSystemState.Initial)
             {
                 logo?.TriggerClick();
                 return true;
             }
 
+            return false;
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed || e.SuperPressed)
+                return false;
+
+            if (triggerInitialOsuLogo())
+                return true;
+
             return base.OnKeyDown(e);
         }
 
         protected override bool OnJoystickPress(JoystickPressEvent e)
         {
-            if (State == ButtonSystemState.Initial)
-            {
-                logo?.TriggerClick();
+            if (triggerInitialOsuLogo())
                 return true;
-            }
 
             return base.OnJoystickPress(e);
         }
 
         protected override bool OnMidiDown(MidiDownEvent e)
         {
-            if (State == ButtonSystemState.Initial)
-            {
-                logo?.TriggerClick();
+            if (triggerInitialOsuLogo())
                 return true;
-            }
 
             return base.OnMidiDown(e);
         }