RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into better-medal-loading

This commit is contained in:
Dean Herbert 2017-10-14 12:29:15 +09:00 committed by GitHub
parent c3b9644d77 b82f3fc710
commit 9385fd1cfa
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -134,6 +134,7 @@ private void updatePreviewTrack(bool playing)
else
{
Preview?.Stop();
loading = false;
}
}
@ -143,6 +144,8 @@ private void beginAudioLoad()
{
if (trackLoader != null) return;
loading = true;
Add(new AsyncLoadWrapper(trackLoader = new TrackLoader($"https://b.ppy.sh/preview/{BeatmapSet.OnlineBeatmapSetID}.mp3")
{
OnLoadComplete = d =>
@ -152,6 +155,7 @@ private void beginAudioLoad()
Preview = (d as TrackLoader)?.Preview;
Playing.TriggerChange();
loading = false;
},
}));
}