From 4b445d6c9c9ecd418a951ecd7bab83648736de47 Mon Sep 17 00:00:00 2001
From: huhenU <36137211+huhenU@users.noreply.github.com>
Date: Tue, 11 Aug 2020 17:12:20 +0200
Subject: [PATCH] Add check for unmounted SD card in emmc (#26)

* Add check for unmounted SD card

* Implement it the better way and remove message Meme doesn't like

* Remove comma and remove dump option if no sd is inserted

Hopefully the last commit to this PR. Hopefully.
---
 source/tegraexplorer/common/structs.c |  2 +-
 source/tegraexplorer/emmc/emmcmenu.c  | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/source/tegraexplorer/common/structs.c b/source/tegraexplorer/common/structs.c
index 98173f8..3501162 100644
--- a/source/tegraexplorer/common/structs.c
+++ b/source/tegraexplorer/common/structs.c
@@ -99,4 +99,4 @@ menu_entry fwDump_typeMenu[] = {
 	{"Firmware format type:", COLOR_WHITE, {ISMENU | ISSKIP}},
 	{"Daybreak (prod.keys required!)", COLOR_BLUE, {ISMENU}},
 	{"ChoiNX", COLOR_VIOLET, {ISMENU}}
-};
\ No newline at end of file
+};
diff --git a/source/tegraexplorer/emmc/emmcmenu.c b/source/tegraexplorer/emmc/emmcmenu.c
index 5170f28..c7f64d1 100644
--- a/source/tegraexplorer/emmc/emmcmenu.c
+++ b/source/tegraexplorer/emmc/emmcmenu.c
@@ -28,6 +28,7 @@ extern sdmmc_storage_t storage;
 extern emmc_part_t *system_part;
 extern char *clipboard;
 extern u8 clipboardhelper;
+extern bool sd_mounted;
 
 
 void addEntry(emmc_part_t *part, u8 property_GPT, int spot){
@@ -73,6 +74,12 @@ int fillMmcMenu(short mmcType){
 
     mu_createObjects(count, &mmcMenuEntries);
 
+    if (!sd_mounted)
+      sd_mount();
+
+    SETBIT(mmcmenu_filemenu[3].property, ISHIDE, !sd_mounted);
+    SETBIT(mmcmenu_start[1].property, ISHIDE, !sd_mounted);
+
     for (i = 0; i < 4; i++)
         mu_copySingle(mmcmenu_start[i].name, mmcmenu_start[i].storage, mmcmenu_start[i].property, &mmcMenuEntries[i]);
 
@@ -92,13 +99,13 @@ int handleEntries(short mmcType, menu_entry part){
             return -1;
         }
         if (!mount_mmc(part.name, part.storage))
-            fileexplorer("emmc:/", 1);  
+            fileexplorer("emmc:/", 1);
     }
     else {
         /*
         if (mmcmenu_filemenu[1].name != NULL)
             free(mmcmenu_filemenu[1].name);
-                    
+
         utils_copystring(part.name, &mmcmenu_filemenu[1].name);
         */
 
@@ -162,7 +169,7 @@ int makeMmcMenu(short mmcType){
                     if (!mmcFlashFile(clipboard, mmcType, true)){
                         gfx_printf("\nDone!");
                         hidWait();
-                    }   
+                    }
                     clipboardhelper = 0;
                 }
                 else
@@ -173,4 +180,4 @@ int makeMmcMenu(short mmcType){
                 break;
         }
     }
-}
\ No newline at end of file
+}