From 8b3477820ffa3eed25566549381d8f241e5192b8 Mon Sep 17 00:00:00 2001
From: Jorolf <jorolf@gmx.de>
Date: Tue, 28 Feb 2017 00:08:34 +0100
Subject: [PATCH 1/2] Disable mousewheel while playing

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 osu.Game/Screens/Play/Player.cs            | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index ccf53ed714..84116a1f70 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -27,6 +27,7 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.DimLevel, 30, 0, 100);
 
             Set(OsuConfig.MouseDisableButtons, false);
+            Set(OsuConfig.MouseDisableWheel, false);
 
             Set(OsuConfig.SnakingInSliders, true);
             Set(OsuConfig.SnakingOutSliders, false);
@@ -99,7 +100,6 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.UsePerBeatmapManiaSpeed, true).Disabled = true;
             Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
             Set(OsuConfig.MenuTip, 0).Disabled = true;
-            Set(OsuConfig.MouseDisableWheel, false).Disabled = true;
             Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
             Set(OsuConfig.Offset, 0, -300, 300).Disabled = true;
             Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b552601458..9ad10c298c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -24,6 +24,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Logging;
+using osu.Framework.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -159,6 +160,8 @@ private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game
                 scoreOverlay,
                 pauseOverlay
             };
+
+            mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
         }
 
         private void initializeSkipButton()
@@ -325,5 +328,9 @@ private void dimChanged(object sender, EventArgs e)
         {
             Background?.FadeTo((100f - dimLevel) / 100, 800);
         }
+
+        private Bindable<bool> mouseWheelDisabled;
+
+        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !isPaused;
     }
 }
\ No newline at end of file

From 522034020e3de16d46aae9bff5753d6f7d9beb10 Mon Sep 17 00:00:00 2001
From: Jorolf <jorolf@gmx.de>
Date: Tue, 28 Feb 2017 11:44:12 +0100
Subject: [PATCH 2/2] Moved Bindable init

---
 osu.Game/Screens/Play/Player.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9ad10c298c..46f93900fc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -73,6 +73,8 @@ public bool IsPaused
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game, OsuConfigManager config)
         {
             dimLevel = config.GetBindable<int>(OsuConfig.DimLevel);
+            mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
+
             try
             {
                 if (Beatmap == null)
@@ -160,8 +162,6 @@ private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game
                 scoreOverlay,
                 pauseOverlay
             };
-
-            mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
         }
 
         private void initializeSkipButton()