From 94682d63e04ae457113f5f49de8aa4d9be0c47bb Mon Sep 17 00:00:00 2001
From: Pk11 <epicpkmn11@outlook.com>
Date: Sat, 18 Dec 2021 21:02:34 -0600
Subject: [PATCH] Fix unmounting drives not responding immediately (#127)

---
 arm9/source/driveMenu.cpp   | 2 +-
 arm9/source/file_browse.cpp | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arm9/source/driveMenu.cpp b/arm9/source/driveMenu.cpp
index d22cf17..451ad12 100644
--- a/arm9/source/driveMenu.cpp
+++ b/arm9/source/driveMenu.cpp
@@ -267,7 +267,7 @@ void driveMenu (void) {
 					break;
 				}
 			}
-		} while (!(pressed & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT | KEY_A | KEY_R | KEY_START
+		} while (!(pressed & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT | KEY_A | KEY_B | KEY_X | KEY_L | KEY_START
 #ifdef SCREENSWAP
 				| KEY_TOUCH
 #endif
diff --git a/arm9/source/file_browse.cpp b/arm9/source/file_browse.cpp
index 5f910bd..0a39140 100644
--- a/arm9/source/file_browse.cpp
+++ b/arm9/source/file_browse.cpp
@@ -650,11 +650,7 @@ std::string browseForFile (void) {
 			if (REG_SCFG_MC != stored_SCFG_MC) {
 				break;
 			}
-
-			if ((held & KEY_R) && (pressed & KEY_L)) {
-				break;
-			}
-		} while (!pressed);
+		} while (!(pressed & ~(KEY_R | KEY_TOUCH | KEY_LID)));
 
 		if (isDSiMode() && !pressed && currentDrive == Drive::flashcard && REG_SCFG_MC == 0x11 && flashcardMounted) {
 			flashcardUnmount();