From d01c9577ab697855ff421fdc6a750fefdc30e4b0 Mon Sep 17 00:00:00 2001
From: Duck <31627079+duckboycool@users.noreply.github.com>
Date: Wed, 11 Mar 2026 16:46:59 -0600
Subject: [PATCH] CommonClient: Add explicit message for connection timeout
 (#5842)

* Change timeout and add timeout-specific message

* Revert open_timeout
---
 CommonClient.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CommonClient.py b/CommonClient.py
index 5fbc0f1b06..3f98a4eff1 100755
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -773,7 +773,7 @@ class CommonContext:
         if len(parts) == 1:
             parts = title.split(', ', 1)
         if len(parts) > 1:
-            text = parts[1] + '\n\n' + text
+            text = f"{parts[1]}\n\n{text}" if text else parts[1]
             title = parts[0]
         # display error
         self._messagebox = MessageBox(title, text, error=True)
@@ -896,6 +896,8 @@ async def server_loop(ctx: CommonContext, address: typing.Optional[str] = None)
                                    "May not be running Archipelago on that address or port.")
     except websockets.InvalidURI:
         ctx.handle_connection_loss("Failed to connect to the multiworld server (invalid URI)")
+    except asyncio.TimeoutError:
+        ctx.handle_connection_loss("Failed to connect to the multiworld server. Connection timed out.")
     except OSError:
         ctx.handle_connection_loss("Failed to connect to the multiworld server")
     except Exception: