h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 04:12:55 +08:00
Code Issues Releases Wiki Activity

Fix multiplayer screens blocking home and alt f4

Browse Source
This commit is contained in:
Joehu 2020-07-14 00:02:01 -07:00
parent daa7430fd8
commit 3573460d9c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -250,12 +250,6 @@ namespace osu.Game.Screens.Multi
{ {
roomManager.PartRoom(); roomManager.PartRoom();
if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
{
screenStack.Exit();
return true;
}
waves.Hide(); waves.Hide();
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut(); this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
@ -269,6 +263,17 @@ namespace osu.Game.Screens.Multi
return false; return false;
} }
public override bool OnBackButton()
{
if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
{
screenStack.Exit();
return true;
}
return false;
}
protected override void LogoExiting(OsuLogo logo) protected override void LogoExiting(OsuLogo logo)
{ {
base.LogoExiting(logo); base.LogoExiting(logo);