From c8913d992e17faf79034b04247d859c26f2efca0 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 7 Jun 2025 22:06:08 +0200 Subject: fix closing setup menu --- client/menu/menu.gd | 1 + client/menu/setup.gd | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'client/menu') diff --git a/client/menu/menu.gd b/client/menu/menu.gd index 774c6c58..8d640f3b 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -67,6 +67,7 @@ func submenu(path: String, data_ = null): print("Submenu closed ", path) await _menu_cover(false) covered = false + Global.focused_menu = self _disable_recursive(self, false) if prev_focus != null: prev_focus.grab_focus() diff --git a/client/menu/setup.gd b/client/menu/setup.gd index b42000a0..de63b801 100644 --- a/client/menu/setup.gd +++ b/client/menu/setup.gd @@ -94,4 +94,5 @@ func _on_sign_pressed(): Global.get_viewport().msaa_2d = Viewport.MSAA_DISABLED - replace_menu("res://menu/main.tscn") + if parent_menu: exit() + else: replace_menu("res://menu/main.tscn") -- cgit v1.2.3-70-g09d2