X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fcommon%2Fmenu.c;h=e6516947815749096b824df9a381f67f2a4e401e;hb=2aaac89caf353de986123ef77358506c81afe907;hp=bd4eb70a774bb342eb44e452282c35b41ca020c4;hpb=b3158e9837629be3d36176728848f10fba341fc9;p=picodrive.git

diff --git a/platform/common/menu.c b/platform/common/menu.c
index bd4eb70..e651694 100644
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -22,8 +22,6 @@
 #include <pico/pico_int.h>
 #include <pico/patch.h>
 
-#define array_size(x) (sizeof(x) / sizeof(x[0]))
-
 static char static_buff[64];
 static char menu_error_msg[64] = { 0, };
 static int  menu_error_time = 0;
@@ -602,7 +600,7 @@ static void load_progress_cb(int percent)
 	plat_video_menu_end();
 }
 
-static void cdload_progress_cb(int percent)
+static void cdload_progress_cb(const char *fname, int percent)
 {
 	int ln, len = percent * g_screen_width / 100;
 	unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;
@@ -610,7 +608,7 @@ static void cdload_progress_cb(int percent)
 	memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);
 
 	smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);
-	smalltext_out16(1, 4 * me_sfont_h, rom_fname_loaded, 0xffff);
+	smalltext_out16(1, 4 * me_sfont_h, fname, 0xffff);
 	dst += g_screen_width * me_sfont_h * 3;
 
 	if (len > g_screen_width)
@@ -647,7 +645,8 @@ void menu_romload_prepare(const char *rom_name)
 
 void menu_romload_end(void)
 {
-	PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;
+	PicoCartLoadProgressCB = NULL;
+	PicoCDLoadProgressCB = NULL;
 	smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h,
 		"Starting emulation...", 0xffff);
 	plat_video_menu_end();
@@ -815,6 +814,11 @@ rescan:
 		}
 	}
 
+	/* make sure action buttons are not pressed on entering menu */
+	draw_dirlist(curr_path, namelist, n, sel);
+	while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))
+		;
+
 	for (;;)
 	{
 		draw_dirlist(curr_path, namelist, n, sel);
@@ -1804,7 +1808,7 @@ static void debug_menu_loop(void)
 		{
 			case 0:
 				if (inp & PBTN_MOK)
-					SekStepM68k();
+					PDebugCPUStep();
 				if (inp & PBTN_MA3) {
 					while (inp & PBTN_MA3)
 						inp = in_menu_wait_any(-1);
@@ -1946,7 +1950,8 @@ void menu_loop(void)
 		if (engineState == PGS_Menu)
 			engineState = PGS_Running;
 		/* wait until menu, ok, back is released */
-		while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
+		while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
+			;
 	}
 
 	in_set_blocking(0);