1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 10:23:04 +08:00

Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete

This commit is contained in:
EVAST9919 2017-10-14 05:05:01 +03:00
commit c5de97a06f

View File

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