From e6d911e49bc4df3eb2b0e75227d07dfa23b93f52 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 3 Mar 2017 14:08:37 +0900
Subject: [PATCH] Move modified key conditional location.

---
 osu.Game/Screens/Menu/Button.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index dd66db8837..e7b933388d 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -257,9 +257,10 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
-            if (args.Repeat) return false;
+            if (args.Repeat || state.Keyboard.ControlPressed || state.Keyboard.ShiftPressed || state.Keyboard.AltPressed)
+                return false;
 
-            if (triggerKey == args.Key && triggerKey != Key.Unknown && !(state.Keyboard.ControlPressed || state.Keyboard.ShiftPressed || state.Keyboard.AltPressed))
+            if (triggerKey == args.Key && triggerKey != Key.Unknown)
             {
                 trigger();
                 return true;