1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 14:12:54 +08:00

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
commit 9385fd1cfa

View File

@ -134,6 +134,7 @@ namespace osu.Game.Overlays.Direct
else
{
Preview?.Stop();
loading = false;
}
}
@ -143,6 +144,8 @@ namespace osu.Game.Overlays.Direct
{
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 @@ namespace osu.Game.Overlays.Direct
Preview = (d as TrackLoader)?.Preview;
Playing.TriggerChange();
loading = false;
},
}));
}