From 86682cdb3480e711d2ecdeab04926c7488a17046 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:16:26 +0900
Subject: [PATCH] Add client/room null check

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 59418cb348..b7adb71e2f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -336,7 +336,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             // Debounce changes to mod settings so as to not thrash the network.
             debouncedModSettingsUpdate?.Cancel();
-            debouncedModSettingsUpdate = Scheduler.AddDelayed(() => client.ChangeUserMods(UserMods.Value), 500);
+            debouncedModSettingsUpdate = Scheduler.AddDelayed(() =>
+            {
+                if (client.Room == null)
+                    return;
+
+                client.ChangeUserMods(UserMods.Value);
+            }, 500);
         }
 
         private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)