h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 20:07:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-carousel-debounce-race

Browse Source
This commit is contained in:
Dean Herbert 2017-07-21 17:44:04 +09:00 committed by GitHub
commit 9a33e77d63
3 changed files with 3 additions and 5 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;

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -190,7 +190,7 @@ namespace osu.Game.Screens.Select
private void carouselBeatmapsLoaded()
{
if (Beatmap.Value != null && Beatmap.Value.BeatmapSetInfo?.DeletePending != false)
if (Beatmap.Value.BeatmapSetInfo?.DeletePending == false)
carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo, false);
else
carousel.SelectNext();