Skip to content

Fix subscription leak from composer reloads #36828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peppy merged 1 commit into from
Mar 5, 2026
Merged

Fix subscription leak from composer reloads #36828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ protected override void LoadComplete()
{
base.LoadComplete();

beatmap.HitObjectAdded += addHitObject;
beatmap.HitObjectRemoved += removeHitObject;
beatmap.HitObjectAdded += hitObjectAdded;
beatmap.HitObjectRemoved += hitObjectRemoved;

if (changeHandler != null)
{
// for now only regenerate replay on a finalised state change, not HitObjectUpdated.
changeHandler.OnStateChange += () => Scheduler.AddOnce(regenerateAutoplay);
changeHandler.OnStateChange += stateChanged;
}
else
{
beatmap.HitObjectUpdated += _ => Scheduler.AddOnce(regenerateAutoplay);
beatmap.HitObjectUpdated += hitObjectUpdated;
}

Scheduler.AddOnce(regenerateAutoplay);
Expand All @@ -71,18 +71,22 @@ private void regenerateAutoplay()
drawableRuleset.SetReplayScore(autoplayMod.CreateScoreFromReplayData(drawableRuleset.Beatmap, drawableRuleset.Mods));
}

private void addHitObject(HitObject hitObject)
private void hitObjectAdded(HitObject hitObject)
{
drawableRuleset.AddHitObject((TObject)hitObject);
drawableRuleset.Playfield.PostProcess();
}

private void removeHitObject(HitObject hitObject)
private void hitObjectRemoved(HitObject hitObject)
{
drawableRuleset.RemoveHitObject((TObject)hitObject);
drawableRuleset.Playfield.PostProcess();
}

private void hitObjectUpdated(HitObject _) => Scheduler.AddOnce(regenerateAutoplay);

private void stateChanged() => Scheduler.AddOnce(regenerateAutoplay);

public override bool PropagatePositionalInputSubTree => false;

public override bool PropagateNonPositionalInputSubTree => false;
Expand All @@ -95,9 +99,13 @@ protected override void Dispose(bool isDisposing)

if (beatmap.IsNotNull())
{
beatmap.HitObjectAdded -= addHitObject;
beatmap.HitObjectRemoved -= removeHitObject;
beatmap.HitObjectAdded -= hitObjectAdded;
beatmap.HitObjectRemoved -= hitObjectRemoved;
beatmap.HitObjectUpdated -= hitObjectUpdated;
}

if (changeHandler != null)
changeHandler.OnStateChange -= stateChanged;
}
}
}
Loading