Merge branch 'master' into legacy-combo-increase

This commit is contained in:
Salman Ahmed 2022-08-25 15:44:08 +03:00 committed by GitHub
commit dad4946481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -142,8 +142,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
case NotifyCollectionChangedAction.Remove: case NotifyCollectionChangedAction.Remove:
foreach (var point in e.OldItems.Cast<PathControlPoint>()) foreach (var point in e.OldItems.Cast<PathControlPoint>())
{ {
Pieces.RemoveAll(p => p.ControlPoint == point); foreach (var piece in Pieces.Where(p => p.ControlPoint == point).ToArray())
Connections.RemoveAll(c => c.ControlPoint == point); piece.RemoveAndDisposeImmediately();
foreach (var connection in Connections.Where(c => c.ControlPoint == point).ToArray())
connection.RemoveAndDisposeImmediately();
} }
// If removing before the end of the path, // If removing before the end of the path,