From a55abdb9b3cc5d198bb8cf68bfc3bab0e7d1d8c9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 18 Mar 2025 15:55:02 +0900
Subject: [PATCH] Fix multiplayer join errors potentially not being logged

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs      | 6 +++++-
 .../OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs   | 7 +------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 6aa366dbc5..c455020f9a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -351,7 +351,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             {
                 joiningRoomOperation?.Dispose();
                 joiningRoomOperation = null;
-                onFailure?.Invoke(error);
+
+                if (onFailure != null)
+                    onFailure(error);
+                else
+                    Logger.Log(error, level: LogLevel.Error);
             });
         });
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index 56b82cdaee..51c135f042 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -88,12 +88,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     if (exception?.GetHubExceptionMessage() is string message)
                         onFailure(message);
                     else
-                    {
-                        const string generic_failure_message = "Failed to join multiplayer room.";
-                        if (result.Exception != null)
-                            Logger.Error(result.Exception, generic_failure_message);
-                        onFailure(generic_failure_message);
-                    }
+                        onFailure($"Failed to join multiplayer room: {exception?.Message}");
                 }
             });
         }