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

Don't use dodgy OnLoaded "event"

Browse Source
This commit is contained in:
Dean Herbert 2017-07-18 15:36:05 +09:00
parent 82217be988
commit 4b4b03756a
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/MusicController.cs
View File

@ -229,7 +229,9 @@ namespace osu.Game.Overlays
{
var track = current.Track;
progressBar.EndTime = track.Length;
progressBar.CurrentTime = track.CurrentTime;
playButton.Icon = track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
if (track.HasCompleted && !track.Looping) next();
@ -300,18 +302,9 @@ namespace osu.Game.Overlays
current = beatmap;
var track = current?.Track;
if (track != null)
{
// the track may not be loaded at this point
track.OnLoaded += loadedTrack => Schedule(() => progressBar.EndTime = loadedTrack.Length);
progressBar.CurrentTime = 0;
if (track.IsLoaded)
// but it also may be.
progressBar.EndTime = track.Length;
}
updateDisplay(beatmap, direction);
updateDisplay(current, direction);
queuedDirection = null;
}