X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=platform%2Fcommon%2Fmenu.c;h=adfacefb03a2417b22ee22ff68db164085ffc46d;hb=974fdb5bfda8ed006661031e22c920828ddb60dc;hp=dff1b39ca6d19c5bf86f71bdfac26c47675efc83;hpb=3e49ffd0bf13f3a889cfb5196c2a61962dff6d0b;p=picodrive.git

diff --git a/platform/common/menu.c b/platform/common/menu.c
index dff1b39..adfacef 100644
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -814,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);
@@ -1447,7 +1452,7 @@ static int menu_loop_adv_options(menu_id id, int keys)
 
 static int mh_opt_render(menu_id id, int keys)
 {
-	plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1);
+	plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 0, 1);
 	return 0;
 }
 
@@ -1803,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);
@@ -1945,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);