Fix START menu not appearing

DS-Homebrew · Jul 18, 2018 · 3545a39 · 3545a39
1 parent b0e904f
commit 3545a39
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/romsel_dsimenutheme/arm9/source/fileBrowse.cpp b/romsel_dsimenutheme/arm9/source/fileBrowse.cpp
@@ -1086,7 +1086,14 @@ string browseForFile(const vector<string> extensionList, const char* username)
 				fifoSendValue32(FIFO_USER_02, 1);	// ReturntoDSiMenu
 			}
 
-			if (pressed & KEY_START)
+			int pressedForStartMenu = 0;
+			if (startButtonLaunch) {
+				pressedForStartMenu = (pressed & KEY_SELECT);
+			} else {
+				pressedForStartMenu = (pressed & KEY_START);
+			}
+
+			if (pressedForStartMenu)
 			{
 				mmEffectEx(&snd_switch);
 				fadeType = false;	// Fade to white
@@ -1114,7 +1121,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 			if (startButtonLaunch) {
 				pressedForPerGameSettings = (pressed & KEY_A);
 			} else {
-				pressedForPerGameSettings = (pressed & KEY_START);
+				pressedForPerGameSettings = (pressed & KEY_SELECT);
 			}
 
 			if (pressedForPerGameSettings && !startMenu

diff --git a/romsel_r4theme/arm9/source/fileBrowse.cpp b/romsel_r4theme/arm9/source/fileBrowse.cpp
@@ -543,7 +543,14 @@ string browseForFile(const vector<string> extensionList, const char* username)
 			showdialogbox = false;
 		}
 
-		if (pressed & KEY_START)
+		int pressedForStartMenu = 0;
+		if (startButtonLaunch) {
+			pressedForStartMenu = (pressed & KEY_SELECT);
+		} else {
+			pressedForStartMenu = (pressed & KEY_START);
+		}
+
+		if (pressedForStartMenu)
 		{
 			if (settingsChanged) {
 				cursorPosition = fileOffset;
@@ -569,7 +576,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 		if (startButtonLaunch) {
 			pressedForPerGameSettings = (pressed & KEY_A);
 		} else {
-			pressedForPerGameSettings = (pressed & KEY_START);
+			pressedForPerGameSettings = (pressed & KEY_SELECT);
 		}
 
 		if (pressedForPerGameSettings && (isDirectory == false) && (bnrRomType == 0) && (isHomebrew == false))