X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=8119505139d9a98d4d7481346716c7dc6d210c0b;hp=3a6ae9c5d5bd7483465a841331687be3f928660d;hb=6f18d16a0abcbc0655ed82fd30796fa06242c2b8;hpb=9a11a883128d9df1fb3e6cce8bde69834c766266

diff --git a/frontend/menu.c b/frontend/menu.c
index 3a6ae9c5..81195051 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -251,7 +251,9 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
 				p = strrchr(buf2, '/');
 				if (p == NULL)
 					p = strrchr(buf2, '\\');
-				if (p == NULL)
+				if (p != NULL)
+					p++;
+				else
 					p = buf2;
 
 				snprintf(buf, sizeof(buf), "%s/%s", basedir, p);
@@ -1698,10 +1700,10 @@ out:
 
 static void handle_memcard_sel(void)
 {
-	Config.Mcd1[0] = 0;
+	strcpy(Config.Mcd1, "none");
 	if (memcard1_sel != 0)
 		snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]);
-	Config.Mcd2[0] = 0;
+	strcpy(Config.Mcd2, "none");
 	if (memcard2_sel != 0)
 		snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]);
 	LoadMcds(Config.Mcd1, Config.Mcd2);