From d129bd0c1fe1c931effb4fc5d2a0f5812cd18bf4 Mon Sep 17 00:00:00 2001 From: skettios Date: Fri, 5 May 2017 17:01:44 -0700 Subject: [PATCH 1/2] Fix ModSelectOverlay accepting escape when it shouldn't Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay. --- osu.Game/Screens/Select/PlaySongSelect.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index c15900eb6d..a8229bd012 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -69,6 +69,14 @@ namespace osu.Game.Screens.Select base.OnResuming(last); } + protected override void OnSuspending(Screen next) + { + if (modSelect.State == Visibility.Visible) + modSelect.Hide(); + + base.OnSuspending(next); + } + protected override bool OnExiting(Screen next) { if (modSelect.State == Visibility.Visible) From 36dff948020184ff1eeff20a773b7e98fda9342f Mon Sep 17 00:00:00 2001 From: skettios Date: Fri, 5 May 2017 18:16:48 -0700 Subject: [PATCH 2/2] removed check if ModSelectOverlay is open --- osu.Game/Screens/Select/PlaySongSelect.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index a8229bd012..315992c113 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -71,8 +71,7 @@ namespace osu.Game.Screens.Select protected override void OnSuspending(Screen next) { - if (modSelect.State == Visibility.Visible) - modSelect.Hide(); + modSelect.Hide(); base.OnSuspending(next); }