From 655d000b513e0d8704b5e3499fb89f16e792f415 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 12 Jul 2024 00:36:02 -0400 Subject: [PATCH] fixed bug where exiting from options would softlock --- menus/level_select_scholar.gd | 2 +- objects/hud/options_screen_scholar.gd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd index ff6056c..3c91d1f 100644 --- a/menus/level_select_scholar.gd +++ b/menus/level_select_scholar.gd @@ -263,7 +263,7 @@ func _on_PalettesButton_button_down() -> void: func _on_OptionsScreen_exit(): options_screen.visible = false - $"%MenuPopup".grab_focus() + $"%OptionsButton".grab_focus() func _on_OptionsButton_button_down(): options_screen.visible = true diff --git a/objects/hud/options_screen_scholar.gd b/objects/hud/options_screen_scholar.gd index 5a6e8f8..4f8d11c 100644 --- a/objects/hud/options_screen_scholar.gd +++ b/objects/hud/options_screen_scholar.gd @@ -40,7 +40,7 @@ func _unhandled_input(event: InputEvent) -> void: Options.save_options() if can_exit and event.is_action_pressed("ui_cancel"): - emit_signal("exit") + if visible == true: emit_signal("exit") func _init_values() -> void: