From 4d323177b8426ded194fbdd321d6bdff66338f25 Mon Sep 17 00:00:00 2001 From: Vantha Date: Thu, 20 Mar 2025 19:04:14 +0100 Subject: [PATCH] Correct error message when the host disconnects After 78900842b1, the following message was shown to clients when the host disconnected during game setup: "Lost connection to the server. [Invalid value undefined]" This patch fixes that. --- .../gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js | 2 +- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js | 2 +- binaries/data/mods/public/gui/session/NetworkStatusOverlay.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js index 03a1f7d056..05a3af820f 100644 --- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js +++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js @@ -28,7 +28,7 @@ class ChatInputPanel { if (message.status == "disconnected") { - reportDisconnect(message.reason, true); + reportDisconnect(message, true); this.chatInput.hidden = true; this.chatSubmitButton.hidden = true; } diff --git a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js index 368a44c86e..f19d0f2271 100644 --- a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js +++ b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js @@ -252,7 +252,7 @@ function pollAndHandleNetworkClient(loadSavedGame) if (message.reason === 16) reportHandshakeDisconnect(message.mismatch_type, message.client_mismatch, message.server_mismatch); else - reportDisconnect(message.reason, false); + reportDisconnect(message, false); return true; default: diff --git a/binaries/data/mods/public/gui/session/NetworkStatusOverlay.js b/binaries/data/mods/public/gui/session/NetworkStatusOverlay.js index d0b4de1d71..c0c930d7f3 100644 --- a/binaries/data/mods/public/gui/session/NetworkStatusOverlay.js +++ b/binaries/data/mods/public/gui/session/NetworkStatusOverlay.js @@ -38,7 +38,7 @@ NetworkStatusOverlay.prototype.StatusCaption = { "authenticated": msg => translate("Connection to the server has been authenticated."), "connected": msg => translate("Connected to the server."), "disconnected": msg => translate("Connection to the server has been lost.") + "\n" + - getDisconnectReason(msg.reason, true), + getDisconnectReason(msg.reason), "waiting_for_players": msg => translate("Waiting for players to connect:"), "join_syncing": msg => translate("Synchronizing gameplay with other players…"), "active": msg => ""