RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-17 12:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-selection-changing

Browse Source
This commit is contained in:
Thomas Müller 2017-07-21 10:22:11 +02:00 committed by GitHub
commit 3a086534f8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -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();
}
}

2
osu.Game/Screens/Play/SongProgressGraph.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
return;
var firstHit = objects.First().StartTime;
var lastHit = (objects.Last() as IHasEndTime)?.EndTime ?? 0;
var lastHit = objects.Max(o => (o as IHasEndTime)?.EndTime ?? o.StartTime);
if (lastHit == 0)
lastHit = objects.Last().StartTime;