RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 19:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where the user can double press escape to exit the song

Browse Source
This commit is contained in:
DrabWeb 2017-01-31 20:44:59 -04:00
parent bcd41a2c8f
commit 13da75f149
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,14 @@ namespace osu.Game.Screens.Play
private double pauseCooldown = 1000;
private double lastPauseActionTime = 0;
private bool canPause
{
get
{
return Time.Current >= (lastPauseActionTime + pauseCooldown);
}
}
private IAdjustableClock sourceClock;
private Ruleset ruleset;
@ -155,7 +163,7 @@ namespace osu.Game.Screens.Play
public void Pause(bool force = false)
{
if (Time.Current >= (lastPauseActionTime + pauseCooldown) || force)
if (canPause || force)
{
lastPauseActionTime = Time.Current;
playerInputManager.PassThrough = true;
@ -259,6 +267,8 @@ namespace osu.Game.Screens.Play
protected override bool OnExiting(GameMode next)
{
if (!canPause) return true;
if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
{
Pause();