sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix escape not working to go backwards in menus before finally exiting the game

Browse Source 
Resolves #2596.
This commit is contained in:
Dean Herbert
2018-05-21 23:09:00 +09:00
parent 1eb465b4ee
commit d109522bf7
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -148,6 +148,8 @@ namespace osu.Game.Screens.Menu
case Key.Space: case Key.Space:
logo?.TriggerOnClick(state); logo?.TriggerOnClick(state);
return true; return true;
case Key.Escape:
return goBack();
} }
return false; return false;
@ -158,17 +160,22 @@ namespace osu.Game.Screens.Menu
switch (action) switch (action)
{ {
case GlobalAction.Back: case GlobalAction.Back:
switch (State) return goBack();
{ default:
case MenuState.TopLevel: return false;
State = MenuState.Initial; }
return true; }
case MenuState.Play:
backButton.TriggerOnClick(); private bool goBack()
return true; {
default: switch (State)
return false; {
} case MenuState.TopLevel:
State = MenuState.Initial;
return true;
case MenuState.Play:
backButton.TriggerOnClick();
return true;
default: default:
return false; return false;
} }