From 593dee202c9d3ed492e1817121b4b01edfb5e576 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Oct 2018 03:03:59 +0900
Subject: [PATCH] Fix gameplay mouse button disable setting no longer having
 any effect

Regressed at https://github.com/ppy/osu/commit/50091252e272564807e046b699d6619382a44891#diff-20562da8cde558aacafa9540b97b7975
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index b0c75a4990..64bbb8b52b 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -73,12 +73,10 @@ namespace osu.Game.Rulesets.UI
         #region IHasReplayHandler
 
         private ReplayInputHandler replayInputHandler;
+
         public ReplayInputHandler ReplayInputHandler
         {
-            get
-            {
-                return replayInputHandler;
-            }
+            get => replayInputHandler;
             set
             {
                 if (replayInputHandler != null) RemoveHandler(replayInputHandler);
@@ -220,6 +218,13 @@ namespace osu.Game.Rulesets.UI
             return base.OnMouseUp(e);
         }
 
+        protected override bool Handle(UIEvent e)
+        {
+            if (mouseDisabled.Value && e is MouseDownEvent me && (me.Button == MouseButton.Left || me.Button == MouseButton.Right)) return false;
+
+            return base.Handle(e);
+        }
+
         #endregion
 
         #region Key Counter Attachment
@@ -269,7 +274,7 @@ namespace osu.Game.Rulesets.UI
     }
 
     public class RulesetInputManagerInputState<T> : InputState
-    where T : struct
+        where T : struct
     {
         public ReplayState<T> LastReplayState;