h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Fixed HotkeyRetryOverlay just going to a black screen

Browse Source
This commit is contained in:
ocboogie 2017-04-17 22:36:03 -07:00
parent 5c48fa6cb1
commit be8d32688b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ namespace osu.Game.Screens.Play
private const double pause_cooldown = 1000;
private double lastPauseActionTime;
private bool restarting = false;
private bool canPause => ValidForResume && !HasFailed && Time.Current >= lastPauseActionTime + pause_cooldown;
private IAdjustableClock sourceClock;
@ -245,6 +247,7 @@ namespace osu.Game.Screens.Play
public void Restart()
{
restarting = true;
OnRestart?.Invoke();
Exit();
}
@ -320,7 +323,7 @@ namespace osu.Game.Screens.Play
if (HasFailed || !ValidForResume)
return false;
if (pauseOverlay != null && !HitRenderer.HasReplayLoaded)
if (pauseOverlay != null && !HitRenderer.HasReplayLoaded && !restarting)
{
//pause screen override logic.
if (pauseOverlay?.State == Visibility.Hidden && !canPause) return true;