From 36041fc2453832976cad0b6c89a0ec0979dae68b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 14 Jul 2020 00:29:57 -0700
Subject: [PATCH] Fix back button not working correctly with multi song
 select's mod select

---
 osu.Game/Screens/Multi/Multiplayer.cs | 12 ++++++++++--
 osu.Game/Screens/Select/SongSelect.cs |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 067a42d57d..2a73b53199 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -20,9 +20,9 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
         [Cached]
-        private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
+        private readonly Bindable<Lounge.Components.FilterCriteria> currentFilter = new Bindable<Lounge.Components.FilterCriteria>(new Lounge.Components.FilterCriteria());
 
         [Cached(Type = typeof(IRoomManager))]
         private RoomManager roomManager;
@@ -265,6 +265,14 @@ namespace osu.Game.Screens.Multi
 
         public override bool OnBackButton()
         {
+            var songSelect = screenStack.CurrentScreen as MatchSongSelect;
+
+            if (songSelect?.ModSelect.State.Value == Visibility.Visible)
+            {
+                songSelect.ModSelect.Hide();
+                return true;
+            }
+
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
             {
                 screenStack.Exit();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 74a5ee8309..87fad66b66 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        protected ModSelectOverlay ModSelect { get; private set; }
+        public ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }