(fdc49c8c) Unstable 0.9.7.1

2020-02-29 14:45:16 -03:00
parent 27e10f7c2e
commit c81486a993
74 changed files with 666 additions and 468 deletions
@@ -1295,7 +1295,20 @@ namespace Barotrauma
                {
                    info.StatusText = friend.GetRichPresence("status") ?? "";
                    string connectCommand = friend.GetRichPresence("connect") ?? "";
-                    ToolBox.ParseConnectCommand(connectCommand.Split(' '), out info.ConnectName, out info.ConnectEndpoint, out info.ConnectLobby);
+
+                    try
+                    {
+                        ToolBox.ParseConnectCommand(ToolBox.SplitCommand(connectCommand), out info.ConnectName, out info.ConnectEndpoint, out info.ConnectLobby);
+                    }
+                    catch (IndexOutOfRangeException e)
+                    {
+#if DEBUG
+                        DebugConsole.ThrowError($"Failed to parse a Steam friend's connect command ({connectCommand})", e);
+#endif
+                        info.ConnectName = null;
+                        info.ConnectEndpoint = null;
+                        info.ConnectLobby = 0;
+                    }
                }
                else
                {