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

Merge branch 'master' into PlayerBase

Browse Source
This commit is contained in:
Dean Herbert
2018-02-16 11:26:57 +09:00
committed by GitHub
parent c57e8785e2 e1f81488cd
commit f22f9b5de0
60 changed files with 1057 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/Player.cs
View File

@ -309,7 +309,7 @@ namespace osu.Game.Screens.Play
protected override bool OnExiting(Screen next)
{
if (!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused != false || RulesetContainer?.HasReplayLoaded != false)
if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused != false || RulesetContainer?.HasReplayLoaded != false) && (!pauseContainer?.IsResuming ?? false))
{
// In the case of replays, we may have changed the playback rate.
applyRateFromMods();
@ -320,7 +320,7 @@ namespace osu.Game.Screens.Play
if (loadedSuccessfully)
{
pauseContainer.Pause();
pauseContainer?.Pause();
}
return true;