Better null handling in StandardIrcClient.ToString()

FAForever · Jul 29, 2024 · 1d3b798 · 1d3b798
1 parent 2eef4cb
commit 1d3b798
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/IrcDotNet/StandardIrcClient.cs b/src/IrcDotNet/StandardIrcClient.cs
@@ -571,10 +571,14 @@ private void HandleSocketError(SocketException exception)
         /// <returns>A string that represents this instance.</returns>
         public override string ToString()
         {
-            if (!IsDisposed && IsConnected)
-                return string.Format("{0}@{1}", LocalUser.UserName,
-                    ServerName ?? socket.RemoteEndPoint.ToString());
-            return "(Not connected)";
+            if (IsDisposed) return "(Disposed)";
+            if (!IsConnected) return "(Not connected)";
+
+            var username = LocalUser?.UserName ?? "Unknown";
+            var serverInfo = ServerName ??
+                (socket?.RemoteEndPoint?.ToString() ?? "Unknown");
+
+            return $"{username}@{serverInfo}";
         }
 
 #if !SILVERLIGHT