From 9adca44fe4db56987c0f820a4608a6c0097e69eb Mon Sep 17 00:00:00 2001 From: CTCaer Date: Wed, 30 Apr 2025 08:38:58 +0300 Subject: [PATCH] nyx: use the now exported window custom action --- nyx/nyx_gui/frontend/gui_emummc_tools.c | 3 +-- nyx/nyx_gui/frontend/gui_options.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/nyx/nyx_gui/frontend/gui_emummc_tools.c b/nyx/nyx_gui/frontend/gui_emummc_tools.c index 82b3ccc0..d02f8747 100644 --- a/nyx/nyx_gui/frontend/gui_emummc_tools.c +++ b/nyx/nyx_gui/frontend/gui_emummc_tools.c @@ -81,8 +81,7 @@ static emummc_part_cfg_t emummc_part_cfg; static lv_res_t _action_emummc_window_close(lv_obj_t *btn) { - lv_win_close_action(btn); - close_btn = NULL; + nyx_win_close_action_custom(btn); // Delete and relaunch main emuMMC window. lv_obj_clean(emummc_parent_cont); diff --git a/nyx/nyx_gui/frontend/gui_options.c b/nyx/nyx_gui/frontend/gui_options.c index d1e958c1..e261cd4d 100644 --- a/nyx/nyx_gui/frontend/gui_options.c +++ b/nyx/nyx_gui/frontend/gui_options.c @@ -1170,13 +1170,11 @@ static lv_res_t _action_win_nyx_options_close(lv_obj_t *btn) lv_obj_set_opa_scale(status_bar.mid, LV_OPA_0); lv_obj_set_click(status_bar.mid, false); - lv_win_close_action(btn); - - close_btn = NULL; + lv_res_t res = nyx_win_close_action_custom(btn); _check_nyx_changes(); - return LV_RES_INV; + return res; } lv_res_t create_win_nyx_options(lv_obj_t *parrent_btn)