h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 22:47:26 +08:00
Code Issues Releases Wiki Activity

Merge pull request #19583 from peppy/fix-preview-track-disposal

Browse Source 
Fix `PreviewTrack`s not being disposed correctly
This commit is contained in:
Dan Balasescu 2022-08-05 15:16:22 +09:00 committed by GitHub
commit a81a2517b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Audio/PreviewTrack.cs
View File

@ -105,5 +105,11 @@ namespace osu.Game.Audio
/// Retrieves the audio track. /// Retrieves the audio track.
/// </summary> /// </summary>
protected abstract Track? GetTrack(); protected abstract Track? GetTrack();
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
Track?.Dispose();
}
} }
} }

3
osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs
View File

@ -118,7 +118,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
// another async load might have completed before this one. // another async load might have completed before this one.
// if so, do not make any changes. // if so, do not make any changes.
if (loadedPreview != previewTrack) if (loadedPreview != previewTrack)
{
loadedPreview.Dispose();
return; return;
}
AddInternal(loadedPreview); AddInternal(loadedPreview);
toggleLoading(false); toggleLoading(false);

3
osu.Game/Overlays/BeatmapSet/Buttons/PlayButton.cs
View File

@ -147,7 +147,10 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
{ {
// beatmapset may have changed. // beatmapset may have changed.
if (Preview != preview) if (Preview != preview)
{
preview?.Dispose();
return; return;
}
AddInternal(preview); AddInternal(preview);
loading = false; loading = false;