sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic and add test coverage for remaining case

Browse Source
This commit is contained in:
Dean Herbert
2019-10-10 20:12:47 +09:00
parent a819a64036
commit 5eba33e876
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,9 @@ namespace osu.Game.Screens.Select
if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
{
UpdateBeatmap(Beatmap.Value);
ensurePlayingSelected(false);
// restart playback on returning to song select, regardless.
music?.Play();
}
base.OnResuming(last);
@ -587,8 +589,7 @@ namespace osu.Game.Screens.Select
/// Ensures some music is playing for the current track.
/// Will resume playback from a manual user pause if the track has changed.
/// </summary>
/// <param name="fromPreviewPoint">Whether to restart from the preview point, rather than resuming from previous location.</param>
private void ensurePlayingSelected(bool fromPreviewPoint = true)
private void ensurePlayingSelected()
{
Track track = Beatmap.Value.Track;
@ -597,7 +598,7 @@ namespace osu.Game.Screens.Select
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
music?.Play(fromPreviewPoint);
music?.Play(true);
lastTrack.SetTarget(track);
}