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

Merge pull request #304 from DrabWeb/master

Browse Source 
Fixed quitting not working
This commit is contained in:
Dean Herbert
2017-02-01 11:47:11 +09:00
committed by GitHub
parent ea204ad606 0d53d3c4ff
commit 42eef9c19a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -161,8 +161,8 @@ namespace osu.Game.Overlays.Pause
Height = button_height, Height = button_height,
Action = delegate Action = delegate
{ {
Hide();
OnRetry?.Invoke(); OnRetry?.Invoke();
Hide();
} }
}, },
new QuitButton new QuitButton
@ -173,8 +173,8 @@ namespace osu.Game.Overlays.Pause
Height = button_height, Height = button_height,
Action = delegate Action = delegate
{ {
Hide();
OnQuit?.Invoke(); OnQuit?.Invoke();
Hide();
} }
} }
} }
@ -199,9 +199,9 @@ namespace osu.Game.Overlays.Pause
} }
private void resume() private void resume()
{ {
Hide();
OnResume?.Invoke(); OnResume?.Invoke();
Hide();
} }
public PauseOverlay() public PauseOverlay()

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

@ -26,6 +26,7 @@ using osu.Game.Overlays.Pause;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using System; using System;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -261,7 +262,7 @@ namespace osu.Game.Screens.Play
protected override bool OnExiting(GameMode next) protected override bool OnExiting(GameMode next)
{ {
if (!canPause) return true; if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
{ {