h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-26 16:30:15 +08:00
Code Issues Releases Wiki Activity

Fixed quitting not working

Browse Source
This commit is contained in:
DrabWeb
2017-01-31 22:33:28 -04:00
Unverified
parent ea204ad606
commit 0d53d3c4ff
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Overlays/Pause/PauseOverlay.cs
+4 -4
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()
osu.Game/Screens/Play/Player.cs
+2 -1
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
{