summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-06-07 22:06:08 +0200
committermetamuffin <metamuffin@disroot.org>2025-06-07 22:06:08 +0200
commitc8913d992e17faf79034b04247d859c26f2efca0 (patch)
treea836631c0a34cecb4b03f65a2f6698bec614b053
parent742f87a08fe87de778f006d90bc128b735f4494d (diff)
downloadhurrycurry-c8913d992e17faf79034b04247d859c26f2efca0.tar
hurrycurry-c8913d992e17faf79034b04247d859c26f2efca0.tar.bz2
hurrycurry-c8913d992e17faf79034b04247d859c26f2efca0.tar.zst
fix closing setup menu
-rw-r--r--client/menu/menu.gd1
-rw-r--r--client/menu/setup.gd3
2 files changed, 3 insertions, 1 deletions
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")