mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 13:22:55 +08:00
Merge branch 'master' into fix-songprogress-endtime
This commit is contained in:
commit
bf254bf5cf
@ -94,9 +94,7 @@ namespace osu.Game.Screens.Menu
|
||||
{
|
||||
if (!track.IsRunning)
|
||||
{
|
||||
track.Seek(metadata.PreviewTime);
|
||||
if (metadata.PreviewTime == -1)
|
||||
track.Seek(track.Length * 0.4f);
|
||||
track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * track.Length);
|
||||
track.Start();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user