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

Fix audio playback position being reset after resuming to song select

Browse Source
This commit is contained in:
Dean Herbert
2019-10-10 11:58:43 +09:00
parent 10c7fc139e
commit f74c79c2b8
2 changed files with 68 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,7 @@ namespace osu.Game.Screens.Select
if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
{
UpdateBeatmap(Beatmap.Value);
ensurePlayingSelected();
ensurePlayingSelected(false);
}
base.OnResuming(last);
@ -587,7 +587,8 @@ 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>
private void ensurePlayingSelected()
/// <param name="fromPreviewPoint">Whether to restart from the preview point, rather than resuming from previous location.</param>
private void ensurePlayingSelected(bool fromPreviewPoint = true)
{
Track track = Beatmap.Value.Track;
@ -596,7 +597,12 @@ namespace osu.Game.Screens.Select
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
track.Restart();
{
if (fromPreviewPoint)
track.Restart();
else
track.Start();
}
lastTrack.SetTarget(track);
}