From 3e750feaa49cd9b0f7dea85965f657181b1c2eeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:42:35 +0900
Subject: [PATCH 1/2] Subclass LocalPlayerModSelectOverlay to correctly
 deselect incompatible mods on free mod selection

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs     | 2 +-
 .../{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} | 2 +-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Overlays/Mods/{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} (88%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 44605f4994..37ebc72984 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 3c889bdec4..89f9b7381b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
similarity index 88%
rename from osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
rename to osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
index d039ad1f98..78cd9bdae5 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class SoloModSelectOverlay : ModSelectOverlay
+    public class LocalPlayerModSelectOverlay : ModSelectOverlay
     {
         protected override void OnModSelected(Mod mod)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 061e3b4d3f..f030879625 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -373,7 +373,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 client.LoadRequested -= onLoadRequested;
         }
 
-        private class UserModSelectOverlay : ModSelectOverlay
+        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public UserModSelectOverlay()
             {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 0baa663578..b201c62b7f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.OnlinePlay
             return base.OnExiting(next);
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        protected override ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay
         {
             IsValidMod = IsValidMod
         };
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ed6e0a1028..b20effc67d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Screens.Select
             (new FooterButtonOptions(), BeatmapOptions)
         };
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 630c5bb74700ae3599013eddf70e2a1cda4a3642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:46:21 +0900
Subject: [PATCH 2/2] Avoid potential crashes when lease is held on
 SelectedMods

---
 osu.Game/OsuGame.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a00cd5e6a0..1a1f7bd233 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -469,6 +469,10 @@ namespace osu.Game
         {
             updateModDefaults();
 
+            // a lease may be taken on the mods bindable, at which point we can't really ensure valid mods.
+            if (SelectedMods.Disabled)
+                return;
+
             if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
             {
                 // ensure we always have a valid set of mods.