From 8b0c6a4c855509aa3de33ddd97e33b70525ab5d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Jul 2018 14:17:19 +0900
Subject: [PATCH] Make SampleControlPoint clone the existing SampleInfo

---
 osu.Game/Audio/SampleInfo.cs                         |  2 ++
 .../Beatmaps/ControlPoints/SampleControlPoint.cs     | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Audio/SampleInfo.cs b/osu.Game/Audio/SampleInfo.cs
index f635b74030..53b6e439f5 100644
--- a/osu.Game/Audio/SampleInfo.cs
+++ b/osu.Game/Audio/SampleInfo.cs
@@ -32,5 +32,7 @@ public class SampleInfo
         /// The sample volume.
         /// </summary>
         public int Volume;
+
+        public SampleInfo Clone() => (SampleInfo)MemberwiseClone();
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 11de392d14..77d42551c6 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -36,12 +36,14 @@ public class SampleControlPoint : ControlPoint
         /// </summary>
         /// <param name="sampleInfo">The <see cref="SampleInfo"/>. This will not be modified.</param>
         /// <returns>The modified <see cref="SampleInfo"/>. This does not share a reference with <paramref name="sampleInfo"/>.</returns>
-        public virtual SampleInfo ApplyTo(SampleInfo sampleInfo) => new SampleInfo
+        public virtual SampleInfo ApplyTo(SampleInfo sampleInfo)
         {
-            Bank = sampleInfo.Bank ?? SampleBank,
-            Name = sampleInfo.Name,
-            Volume = sampleInfo.Volume > 0 ? sampleInfo.Volume : SampleVolume
-        };
+            var newSampleInfo = sampleInfo.Clone();
+            newSampleInfo.Bank = sampleInfo.Bank ?? SampleBank;
+            newSampleInfo.Name = sampleInfo.Name;
+            newSampleInfo.Volume = sampleInfo.Volume > 0 ? sampleInfo.Volume : SampleVolume;
+            return newSampleInfo;
+        }
 
         public override bool ChangeEquals(ControlPoint other)
             => base.ChangeEquals(other)