From a25c82a8cee55404aaba350e218ae0f8e59b9548 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Sat, 6 Feb 2021 04:10:50 +0200 Subject: [PATCH] nyx: Allow fix hybrid mbr tool to always run --- nyx/nyx_gui/frontend/gui_tools_partition_manager.c | 3 ++- nyx/nyx_gui/storage/nx_sd.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c index 53e4da7..263dc5d 100644 --- a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c +++ b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c @@ -2017,7 +2017,8 @@ static lv_res_t _action_fix_mbr(lv_obj_t *btn) lv_obj_t *lbl_status = lv_label_create(mbox, NULL); lv_label_set_recolor(lbl_status, true); - if (!sd_mount()) + // Try to init sd card. No need for valid MBR. + if (!sd_mount() && !sd_get_card_initialized()) { lv_label_set_text(lbl_status, "#FFDD00 Failed to init SD!#"); goto out; diff --git a/nyx/nyx_gui/storage/nx_sd.c b/nyx/nyx_gui/storage/nx_sd.c index 78f3547..a8f67ce 100644 --- a/nyx/nyx_gui/storage/nx_sd.c +++ b/nyx/nyx_gui/storage/nx_sd.c @@ -60,6 +60,11 @@ bool sd_get_card_removed() return false; } +bool sd_get_card_initialized() +{ + return sd_init_done; +} + u32 sd_get_mode() { return sd_mode;