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

Merge branch 'master' into no-drawable-speedchangevis

Browse Source
This commit is contained in:
Dean Herbert 2018-11-14 13:22:01 +09:00 committed by GitHub
commit 8d59b7299f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,10 +245,10 @@ namespace osu.Game.Overlays
{ {
base.Update(); base.Update();
if (current?.TrackLoaded ?? false) var track = current?.TrackLoaded ?? false ? current.Track : null;
{
var track = current.Track;
if (track?.IsDummyDevice == false)
{
progressBar.EndTime = track.Length; progressBar.EndTime = track.Length;
progressBar.CurrentTime = track.CurrentTime; progressBar.CurrentTime = track.CurrentTime;
@ -258,7 +258,11 @@ namespace osu.Game.Overlays
next(); next();
} }
else else
{
progressBar.CurrentTime = 0;
progressBar.EndTime = 1;
playButton.Icon = FontAwesome.fa_play_circle_o; playButton.Icon = FontAwesome.fa_play_circle_o;
}
} }
private void play() private void play()