From d6490899e2946294bbdab7f0d0db6a5bd014ce5d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 03:21:56 +0200
Subject: [PATCH] Simplify slider path bindings

Adds a slight performance overhead, but solves the memory leak and makes the code much easier to follow.
---
 .../Components/PathControlPointPiece.cs       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index bb50fec5dc..20d4fe4ea9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
@@ -59,20 +58,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            var pathTypes = new List<IBindable<PathType?>>();
 
-            slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
+            slider.Path.Version.BindValueChanged(_ =>
             {
-                pathTypes.Clear();
-
-                foreach (var point in slider.Path.ControlPoints)
-                {
-                    IBindable<PathType?> boundTypeCopy = point.Type.GetBoundCopy();
-                    pathTypes.Add(boundTypeCopy);
-                    boundTypeCopy.BindValueChanged(_ => PointsInSegment = slider.Path.PointsInSegment(controlPoint));
-                }
-
-                PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+                PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+                updatePathType();
             }, runOnceImmediately: true);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
@@ -120,9 +110,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.LoadComplete();
 
-            sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ => updatePathType());
-
             sliderPosition = slider.PositionBindable.GetBoundCopy();
             sliderPosition.BindValueChanged(_ => updateMarkerDisplay());