[SWITCH] allow browsing to parent folders

rsn8887 · Nov 5, 2018 · 5a6fb71 · 5a6fb71
1 parent cba37f4
commit 5a6fb71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/gp2x/menu/menu_controls.cpp b/src/gp2x/menu/menu_controls.cpp
@@ -525,7 +525,7 @@ static void draw_controlsMenu(int c)
 #if defined(__PSP2__)
 	write_text(leftMargin,menuLine,"Triangle");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   (X)");
+	write_text(leftMargin,menuLine,"   X");
 #else
 	write_text(leftMargin,menuLine,"   (Y)");
 #endif
@@ -540,7 +540,7 @@ static void draw_controlsMenu(int c)
 #if defined(__PSP2__)
 	write_text(leftMargin,menuLine,"Cross");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   (B)");
+	write_text(leftMargin,menuLine,"   B");
 #else
 	write_text(leftMargin,menuLine,"   (X)");
 #endif
@@ -555,7 +555,7 @@ static void draw_controlsMenu(int c)
 #if defined(__PSP2__)
 	write_text(leftMargin,menuLine,"Square");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   (Y)");
+	write_text(leftMargin,menuLine,"   Y");
 #else
 	write_text(leftMargin,menuLine,"   (A)");
 #endif
@@ -570,7 +570,7 @@ static void draw_controlsMenu(int c)
 #if defined(__PSP2__)
 	write_text(leftMargin,menuLine,"Circle");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   (A)");
+	write_text(leftMargin,menuLine,"   A");
 #else
 	write_text(leftMargin,menuLine,"   (B)");
 #endif

diff --git a/src/gp2x/menu/menu_load.cpp b/src/gp2x/menu/menu_load.cpp
@@ -222,6 +222,7 @@ static int menuLoadLoop(char *curr_path)
 	max_in_dir=SHOW_MAX_FILES;
 
 #if defined(__PSP2__) || defined(__SWITCH__)
+#if !defined(__SWITCH__)
 	if(strcmp(curr_path, "/") == 0 || curr_path[0] == 0) 
 	{
 		struct dirent *ent = NULL;
@@ -245,6 +246,7 @@ static int menuLoadLoop(char *curr_path)
 		curr_path[0] == 0;
 	}
 	else
+#endif
 	{
 		if ((dir = opendir(curr_path)) == NULL)
 		{
@@ -450,10 +452,10 @@ static int menuLoadLoop(char *curr_path)
 						{
 							strcpy(newdir, "ux0:/");
 						}
-						else if (strcmp(namelist[sel+1]->d_name, "sdmc:") == 0)
-						{
-							strcpy(newdir, "sdmc:/");
-						}
+						//else if (strcmp(namelist[sel+1]->d_name, "sdmc:") == 0)
+						//{
+						//	strcpy(newdir, "sdmc:/");
+						//}
 						else 
 						{
 							strcpy(newdir, curr_path);