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

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
commit 42eef9c19a
2 changed files with 6 additions and 5 deletions
Show Stats 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,
Action = delegate
{
Hide();
OnRetry?.Invoke();
Hide();
}
},
new QuitButton
@ -173,8 +173,8 @@ namespace osu.Game.Overlays.Pause
Height = button_height,
Action = delegate
{
Hide();
OnQuit?.Invoke();
Hide();
}
}
}
@ -199,9 +199,9 @@ namespace osu.Game.Overlays.Pause
}
private void resume()
{
Hide();
{
OnResume?.Invoke();
Hide();
}
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 System;
using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Screens.Play
{
@ -261,7 +262,7 @@ namespace osu.Game.Screens.Play
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
{