From c233dc476800e7df39ee242a7515cc6bc8beb5e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 27 Jun 2020 00:16:16 +0900
Subject: [PATCH] Add some global error handling

---
 osu.Game/Screens/Multi/RoomManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 4d6ac46c84..b8c969a845 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -166,8 +166,16 @@ namespace osu.Game.Screens.Multi
                 var r = listing[i];
                 r.Position.Value = i;
 
-                update(r, r);
-                addRoom(r);
+                try
+                {
+                    update(r, r);
+                    addRoom(r);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
+                    rooms.Remove(r);
+                }
             }
 
             RoomsUpdated?.Invoke();