From 73d6a3687eacd25e26501cc2b9ea061b86512c38 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:40:56 +0000
Subject: [PATCH] Change rate correction logic to be more explicit

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 10 ++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 9bd5b5eefd..c8d79325a3 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - FinalRate.Precision));
+            {
+                if (val.NewValue <= FinalRate.Value)
+                    FinalRate.Value = val.NewValue - FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + InitialRate.Precision));
+            {
+                if (val.NewValue >= InitialRate.Value)
+                    InitialRate.Value = val.NewValue + FinalRate.Precision;
+            });
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 39d3c9c5d5..4fc1f61e02 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + FinalRate.Precision));
+            {
+                if (val.NewValue >= FinalRate.Value)
+                    FinalRate.Value = val.NewValue + FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - InitialRate.Precision));
+            {
+                if (val.NewValue <= InitialRate.Value)
+                    InitialRate.Value = val.NewValue - FinalRate.Precision;
+            });
         }
     }
 }