X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmenu.c;h=0e578b135751a0f4771cc475cb3db813214ce6d7;hb=61f66fe0ab7ab4047a2c005fc52afeb50c26fc12;hp=5768a9c2e0416df7cfbf02bf296657e5cd3c02c1;hpb=dfa8d77a42bf22658504d9d1f3d6700dd41d0c7d;p=libpicofe.git

diff --git a/psp/menu.c b/psp/menu.c
index 5768a9c..0e578b1 100644
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -825,7 +825,7 @@ menu_entry cdopt_entries[] =
 	{ NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },
 	{ NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },
 	{ "CD LEDs",                   MB_ONOFF, MA_CDOPT_LEDS,         &currentConfig.EmuOpt,  0x0400, 0, 0, 1, 1 },
-	{ "CDDA audio (using mp3s)",   MB_ONOFF, MA_CDOPT_CDDA,         &PicoOpt, 0x0800, 0, 0, 1, 1 },
+	{ "CDDA audio",                MB_ONOFF, MA_CDOPT_CDDA,         &PicoOpt, 0x0800, 0, 0, 1, 1 },
 	{ "PCM audio",                 MB_ONOFF, MA_CDOPT_PCM,          &PicoOpt, 0x0400, 0, 0, 1, 1 },
 	{ NULL,                        MB_NONE,  MA_CDOPT_READAHEAD,    NULL, 0, 0, 0, 1, 1 },
 	{ "SaveRAM cart",              MB_ONOFF, MA_CDOPT_SAVERAM,      &PicoOpt, 0x8000, 0, 0, 1, 1 },
@@ -1161,6 +1161,7 @@ menu_entry opt2_entries[] =
 	{ "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,    &currentConfig.EmuOpt, 0x00008, 0, 0, 1, 1 },
 	{ "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,    &currentConfig.EmuOpt, 0x00020, 0, 0, 1, 1 },
 	{ "Status line in main menu",  MB_ONOFF, MA_OPT2_STATUS_LINE,    &currentConfig.EmuOpt, 0x20000, 0, 0, 1, 1 },
+	{ "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS,  &PicoOpt, 0x80000, 0, 0, 1, 1 },
 	{ "Disable frame limiter",     MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, &currentConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
 	{ "done",                      MB_NONE,  MA_OPT2_DONE,           NULL, 0, 0, 0, 1, 0 },
 };
@@ -1631,10 +1632,10 @@ static void menu_loop_root(void)
 				{
 					char curr_path[PATH_MAX], *selfname;
 					FILE *tstf;
-					if ( (tstf = fopen(lastRomFile, "rb")) )
+					if ( (tstf = fopen(loadedRomFName, "rb")) )
 					{
 						fclose(tstf);
-						strcpy(curr_path, lastRomFile);
+						strcpy(curr_path, loadedRomFName);
 					}
 					else
 						getcwd(curr_path, PATH_MAX);
@@ -1776,10 +1777,10 @@ int menu_loop_tray(void)
 
 	menu_gfx_prepare();
 
-	if ( (tstf = fopen(lastRomFile, "rb")) )
+	if ( (tstf = fopen(loadedRomFName, "rb")) )
 	{
 		fclose(tstf);
-		strcpy(curr_path, lastRomFile);
+		strcpy(curr_path, loadedRomFName);
 	}
 	else
 	{
@@ -1803,7 +1804,7 @@ int menu_loop_tray(void)
 					if (selfname) {
 						int ret = -1;
 						cd_img_type cd_type;
-						cd_type = emu_cdCheck(NULL);
+						cd_type = emu_cdCheck(NULL, romFileName);
 						if (cd_type != CIT_NOT_CD)
 							ret = Insert_CD(romFileName, cd_type);
 						if (ret != 0) {