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

Merge branch 'master' into UserDimLogic

Browse Source
This commit is contained in:
David Zhao
2019-02-15 17:11:21 +09:00
committed by GitHub
parent 53b7fdd834 31bbefb9a8
commit 8693d6a76b
61 changed files with 514 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,7 @@ namespace osu.Game.Screens.Play
return true;
}
if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused != false || RulesetContainer?.HasReplayLoaded != false) && (!pauseContainer?.IsResuming ?? true))
if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused.Value != false || RulesetContainer?.HasReplayLoaded.Value != false) && (!pauseContainer?.IsResuming ?? true))
{
// In the case of replays, we may have changed the playback rate.
applyRateFromMods();