From aebb7f1e9145639d39ab63da4df554a708a0c0f0 Mon Sep 17 00:00:00 2001
From: RocketRobz <bobesh8@gmail.com>
Date: Tue, 4 Feb 2020 20:31:00 -0700
Subject: [PATCH] Only unmount SD card, if it was last opened

---
 arm9/source/driveMenu.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/arm9/source/driveMenu.cpp b/arm9/source/driveMenu.cpp
index 776f1d4..698162d 100644
--- a/arm9/source/driveMenu.cpp
+++ b/arm9/source/driveMenu.cpp
@@ -349,14 +349,25 @@ void driveMenu (void) {
 			dmTextPrinted = false;
 			if (isDSiMode() && sdMountedDone) {
 				if (sdMounted) {
-					sdUnmount();
+					if (currentDrive == 0) {
+						sdUnmount();
+					} else {
+						consoleSelect(&bottomConsole);
+						consoleClear();
+						printf ("\x1B[47m");		// Print foreground white color
+						printf ("Please open and exit SDCARD\n");
+						printf ("before unmounting.\n");
+						for (int i = 0; i < 60*2; i++) {
+							swiWaitForVBlank();
+						}
+					}
 				} else if (isRegularDS) {
 					sdMounted = sdMount();
 				}
 			} else {
-				if (flashcardMounted) {
+				if (flashcardMounted && currentDrive == 1) {
 					flashcardUnmount();
-				} else {
+				} else if (!flashcardMounted)  {
 					flashcardMounted = flashcardMount();
 				}
 			}