From 35629e9be815c41788633363c38ec9f6450669ea Mon Sep 17 00:00:00 2001
From: Ame <ajiiisai@protonmail.com>
Date: Sat, 2 Apr 2022 20:45:00 +0200
Subject: [PATCH] General fix for ToolbarButton toggle repetition

---
 osu.Game/OsuGame.cs                        | 24 +---------------------
 osu.Game/Overlays/Toolbar/ToolbarButton.cs |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3703318e81..73121f6e7d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -95,8 +95,6 @@ namespace osu.Game
 
         private SkinEditorOverlay skinEditor;
 
-        private NowPlayingOverlay nowPlayingOverlay;
-
         private Container overlayContent;
 
         private Container rightFloatingOverlayContent;
@@ -820,7 +818,7 @@ namespace osu.Game
                 Origin = Anchor.TopRight,
             }, rightFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(nowPlayingOverlay = new NowPlayingOverlay
+            loadComponentSingleFile(new NowPlayingOverlay
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -1071,26 +1069,6 @@ namespace osu.Game
 
                     SkinManager.SelectRandomSkin();
                     return true;
-
-                case GlobalAction.ToggleChat:
-                    chatOverlay.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleSocial:
-                    dashboard.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleNowPlaying:
-                    nowPlayingOverlay.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleBeatmapListing:
-                    beatmapListing.ToggleVisibility();
-                    return true;
-
-                case GlobalAction.ToggleSettings:
-                    Settings.ToggleVisibility();
-                    return true;
             }
 
             return false;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index c855b76680..670ce65c6b 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Overlays.Toolbar
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (e.Action == Hotkey)
+            if (!e.Repeat && e.Action == Hotkey)
             {
                 TriggerClick();
                 return true;