From cac136d3c6026cf2bb8b8e35d736520e5ebdc67c Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 2 Sep 2025 09:21:31 +0900 Subject: [PATCH] Fix editor memory leak --- .../Compose/Components/Timeline/SamplePointPiece.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs index 5e8637c1ac..cdd2f52dab 100644 --- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs +++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs @@ -16,7 +16,6 @@ using osu.Framework.Graphics.UserInterface; using osu.Framework.Input.Events; using osu.Framework.Utils; using osu.Game.Audio; -using osu.Game.Configuration; using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterfaceV2; @@ -57,9 +56,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline protected virtual double GetTime() => HitObject is IHasRepeats r ? HitObject.StartTime + r.Duration / r.SpanCount() / 2 : HitObject.StartTime; [BackgroundDependencyLoader] - private void load(OsuConfigManager config) + private void load() { - HitObject.DefaultsApplied += _ => updateText(); Label.AllowMultiline = false; LabelContainer.AutoSizeAxes = Axes.None; updateText(); @@ -74,6 +72,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline { base.LoadComplete(); + HitObject.DefaultsApplied += onDefaultsApplied; + if (timelineBlueprintContainer != null) contracted.BindTo(timelineBlueprintContainer.SamplePointContracted); @@ -96,12 +96,19 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline FinishTransforms(); } + private void onDefaultsApplied(HitObject hitObject) + { + updateText(); + } + protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); if (editor != null) editor.ShowSampleEditPopoverRequested -= onShowSampleEditPopoverRequested; + + HitObject.DefaultsApplied -= onDefaultsApplied; } private void onShowSampleEditPopoverRequested(double time)