RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-22 19:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6406 from Joehuu/resume-music-gameplay-exit

Browse Source 
Resume music to same position when exiting gameplay
This commit is contained in:
Dean Herbert 2019-10-06 13:51:10 +08:00 committed by GitHub
commit d547f9cc68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,7 +413,7 @@ namespace osu.Game.Screens.Select
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, previous); Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, previous);
if (this.IsCurrentScreen() && Beatmap.Value?.Track != previous?.Track) if (this.IsCurrentScreen() && Beatmap.Value?.Track != previous?.Track)
ensurePlayingSelected(); ensurePlayingSelected(true);
if (beatmap != null) if (beatmap != null)
{ {
@ -585,18 +585,14 @@ namespace osu.Game.Screens.Select
{ {
Track track = Beatmap.Value.Track; Track track = Beatmap.Value.Track;
if (!track.IsRunning || restart) if (!track.IsRunning)
{ {
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime; track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
if (music != null) if (restart)
{
// use the global music controller (when available) to cancel a potential local user paused state.
music.SeekTo(track.RestartPoint);
music.Play();
}
else
track.Restart(); track.Restart();
else
track.Start();
} }
} }