From 22f3e97241e88310c4a9a760088bfd6a77380bf8 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Thu, 20 Jul 2017 17:15:39 +0200 Subject: [PATCH 1/3] Small optimization to the main menu intro seeking. --- osu.Game/Screens/Menu/MainMenu.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index df9b304a47..def9c13c10 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -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(); } } From b4dddc98eeedb09a232f36eb84015d06e3684bd0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Jul 2017 06:15:44 +0900 Subject: [PATCH 2/3] Fix selection changing on entering song select Conditional was backwards, easy fix. --- osu.Game/Screens/Select/SongSelect.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index 9e1d230124..90057cf638 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -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(); From f7b64a458a33fa862fe63b7763acf213f840bddf Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Jul 2017 10:08:39 +0900 Subject: [PATCH 3/3] Fix incorrect end time calculation in SongProgressGraph --- osu.Game/Screens/Play/SongProgressGraph.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/SongProgressGraph.cs b/osu.Game/Screens/Play/SongProgressGraph.cs index 9251ca33a4..541065e532 100644 --- a/osu.Game/Screens/Play/SongProgressGraph.cs +++ b/osu.Game/Screens/Play/SongProgressGraph.cs @@ -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;