From 87a7f340e3100b7f1ee1f9a2c4b05abdb194b86b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Dec 2019 18:12:44 +0900
Subject: [PATCH] Fix first sample point being treated as redundant

---
 osu.Game.Tests/NonVisual/ControlPointInfoTest.cs    | 12 ++++++------
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index a51b90851c..0535473a3f 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -60,18 +60,18 @@ namespace osu.Game.Tests.NonVisual
         {
             var cpi = new ControlPointInfo();
 
-            cpi.Add(0, new SampleControlPoint()); // is redundant
+            cpi.Add(0, new SampleControlPoint()); // is *not* redundant, special exception for first sample point
             cpi.Add(1000, new SampleControlPoint()); // is redundant
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(0));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
             Assert.That(cpi.TimingPoints.Count, Is.EqualTo(0));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(0));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
 
             cpi.Add(1000, new SampleControlPoint { SampleVolume = 50 }); // is not redundant
 
-            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
-            Assert.That(cpi.SamplePoints.Count, Is.EqualTo(1));
-            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(1));
+            Assert.That(cpi.Groups.Count, Is.EqualTo(2));
+            Assert.That(cpi.SamplePoints.Count, Is.EqualTo(2));
+            Assert.That(cpi.AllControlPoints.Count(), Is.EqualTo(2));
         }
 
         [Test]
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index ce2783004c..6965544292 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
 
                 case SampleControlPoint _:
-                    existing = SamplePointAt(time);
+                    existing = binarySearch(SamplePoints, time);
                     break;
 
                 case DifficultyControlPoint _: