X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmenu.c;h=744c99d0283309602e2c73e79597465291816623;hb=446b090ceade65a57b2f97493d6670ffb236a747;hp=48de81edab36abe45e73e55648228f47526a9558;hpb=1ceda4176ff86029e143802e2b5999dd2d091e9c;p=libpicofe.git

diff --git a/psp/menu.c b/psp/menu.c
index 48de81e..744c99d 100644
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -52,18 +52,21 @@ static unsigned int inp_prev = 0;
 static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 {
 	unsigned int ret;
-	static int repeats = 0, wait = 50;
+	static int repeats = 0, wait = 6;
 	int release = 0, count, i;
 
 	if (!is_key_config)
 		interesting |= (interesting & 0xf0) << 24; // also use analog
 
-	if (repeats == 2 || repeats == 4) wait /= 2;
-	if (repeats == 6) wait = 15;
+	if      (repeats == 2) wait = 3;
+	else if (repeats == 4) wait = 2;
+	else if (repeats == 6) wait = 1;
 
-	for (i = 0; i < 6 && inp_prev == psp_pad_read(1); i++) {
+	for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) {
+
+	for (i = 0; i < wait && inp_prev == psp_pad_read(1); i++) {
 		if (i == 0) repeats++;
-		psp_msleep(wait);
+		psp_msleep(30);
 	}
 
 	for (count = 0; !((ret = psp_pad_read(1)) & interesting) && count < 100; count++) {
@@ -73,7 +76,7 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 50;
+		wait = 6;
 	}
 	inp_prev = ret;
 
@@ -1624,6 +1627,7 @@ static void menu_loop_root(void)
 					if (rom_loaded) {
 						if(savestate_menu_loop(1))
 							continue;
+						while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50);
 						engineState = PGS_Running;
 						return;
 					}
@@ -1631,6 +1635,7 @@ static void menu_loop_root(void)
 				case MA_MAIN_RESET_GAME:
 					if (rom_loaded) {
 						emu_ResetGame();
+						while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50);
 						engineState = PGS_Running;
 						return;
 					}