From 618139aa38ec026c6588a2cb0bc715ff21f6b8cb Mon Sep 17 00:00:00 2001
From: tpart <tpart120@proton.me>
Date: Thu, 30 Oct 2025 19:54:31 +0100
Subject: Correctly show incorrect packet message

---
 client/game.gd              | 3 ++-
 client/gui/menus/error.tscn | 2 ++
 client/gui/menus/menu.gd    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/game.gd b/client/game.gd
index 2c65138d..86aa8c88 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -388,7 +388,8 @@ func handle_packet(p):
 		"redirect":
 			get_parent().replace_menu("res://gui/menus/game.tscn", p.uri[0])
 		"disconnect":
-			get_parent().replace_menu("res://gui/menus/error.tscn", [tr(p.reason.translation.id), menu.data])
+			var m := MessageParser.new(p.reason, self)
+			get_parent().replace_menu("res://gui/menus/error.tscn", [m.result, menu.data])
 		"replay_start":
 			is_replay = true
 		"replay_stop":
diff --git a/client/gui/menus/error.tscn b/client/gui/menus/error.tscn
index 37f8019f..1f5511a4 100644
--- a/client/gui/menus/error.tscn
+++ b/client/gui/menus/error.tscn
@@ -49,10 +49,12 @@ text = "c.menu.error.title"
 horizontal_alignment = 1
 
 [node name="Message" type="Label" parent="Panel/SmartMarginContainer/Contents"]
+custom_minimum_size = Vector2(500, 0)
 layout_mode = 2
 theme_override_font_sizes/font_size = 24
 text = "This should be the error message."
 horizontal_alignment = 1
+autowrap_mode = 3
 
 [node name="Control" type="Control" parent="Panel/SmartMarginContainer/Contents"]
 custom_minimum_size = Vector2(0, 15.805)
diff --git a/client/gui/menus/menu.gd b/client/gui/menus/menu.gd
index 5933f777..0aeb413c 100644
--- a/client/gui/menus/menu.gd
+++ b/client/gui/menus/menu.gd
@@ -31,6 +31,7 @@ var transition: SceneTransition
 var parent_menu: Menu = null
 var previous_path = null # : String
 var open_since = 0
+var exiting := false
 
 func _ready():
 	open_since = Time.get_ticks_msec()
@@ -102,7 +103,9 @@ func quit():
 	get_parent().quit()
 
 func replace_menu(path: String, data_ = null, prev_path = null): # prev_path: String?
+	if exiting: return # Already fading out
 	print("Replace menu: ", path)
+	exiting = true
 	if popup != null: await popup.exit()
 	_disable_recursive(self, true)
 	await _menu_exit()
-- 
cgit v1.3