From 862fee8e68e7d3a54bcd6a23cbcea3cce3c8fdf0 Mon Sep 17 00:00:00 2001
From: Pk11 <epicpkmn11@outlook.com>
Date: Sun, 2 Jan 2022 15:13:36 -0600
Subject: [PATCH] Fix crash on mounting SD if booted without SD card

---
 arm9/source/driveMenu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arm9/source/driveMenu.cpp b/arm9/source/driveMenu.cpp
index 398c846..12dc502 100644
--- a/arm9/source/driveMenu.cpp
+++ b/arm9/source/driveMenu.cpp
@@ -155,7 +155,7 @@ void dm_drawBottomScreen(void) {
 
 	font->print(0, row--, false, STR_START_START_MENU);
 
-	if (sdMountedDone) {
+	if (!arm7SCFGLocked) {
 		font->print(0, row--, false, sdMounted ? STR_UNMOUNT_SDCARD : STR_REMOUNT_SDCARD);
 	} else {
 		font->print(0, row--, false, flashcardMounted ? STR_UNMOUNT_FLASHCARD : STR_REMOUNT_FLASHCARD);
@@ -391,7 +391,7 @@ void driveMenu (void) {
 
 		// Unmount/Remount SD card
 		if ((held & KEY_R) && (pressed & KEY_B)) {
-			if (isDSiMode() && sdMountedDone) {
+			if (!arm7SCFGLocked) {
 				if (sdMounted) {
 					currentDrive = Drive::sdCard;
 					chdir("sd:/");