h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
Code Issues Releases Wiki Activity

Reapply schedule workaround for PreviewTrack

Browse Source
This commit is contained in:
Dean Herbert 2021-11-26 22:34:05 +09:00
parent 35a347ce60
commit f16ef1ee69
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
if (previewTrack == null) if (previewTrack == null)
{ {
toggleLoading(true); toggleLoading(true);
LoadComponentAsync(previewTrack = previewTrackManager.Get(beatmapSetInfo), onPreviewLoaded); LoadComponentAsync(previewTrack = previewTrackManager.Get(beatmapSetInfo), onPreviewLoaded);
} }
else else
@ -112,18 +113,23 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
private void onPreviewLoaded(PreviewTrack loadedPreview) private void onPreviewLoaded(PreviewTrack loadedPreview)
{ {
// another async load might have completed before this one. // Make sure that we schedule to after the next audio frame to fix crashes in single-threaded execution.
// if so, do not make any changes. // See: https://github.com/ppy/osu-framework/issues/4692
if (loadedPreview != previewTrack) Schedule(() =>
return; {
// another async load might have completed before this one.
// if so, do not make any changes.
if (loadedPreview != previewTrack)
return;
AddInternal(loadedPreview); AddInternal(loadedPreview);
toggleLoading(false); toggleLoading(false);
loadedPreview.Stopped += () => Schedule(() => Playing.Value = false); loadedPreview.Stopped += () => Schedule(() => Playing.Value = false);
if (Playing.Value) if (Playing.Value)
tryStartPreview(); tryStartPreview();
});
} }
private void tryStartPreview() private void tryStartPreview()