X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=f77bc9d24f34ec47ae94f701a835449b8856903c;hp=a984bbf079341ef8a62fbd8727052402530a7803;hb=c65553d0cafc353daad3fdcc0aab63bb8427a809;hpb=79f216e32563acc81517729fe56a6f11f110b0a4

diff --git a/frontend/menu.c b/frontend/menu.c
index a984bbf0..f77bc9d2 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -624,12 +624,18 @@ static void draw_savestate_bg(int slot)
 
 	x = gpu->ulControl[5] & 0x3ff;
 	y = (gpu->ulControl[5] >> 10) & 0x1ff;
-	s = (u16 *)gpu->psxVRam + y * 1024 + x;
 	w = psx_widths[(gpu->ulStatus >> 16) & 7];
 	tmp = gpu->ulControl[7];
 	h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
 	if (gpu->ulStatus & 0x80000) // doubleheight
 		h *= 2;
+	if (h <= 0 || h > 512)
+		goto out;
+	if (y > 512 - 64)
+		y = 0;
+	if (y + h > 512)
+		h = 512 - y;
+	s = (u16 *)gpu->psxVRam + y * 1024 + x;
 
 	x = max(0, g_menuscreen_w - w) & ~3;
 	y = max(0, g_menuscreen_h / 2 - h / 2);
@@ -683,10 +689,11 @@ me_bind_action emuctrl_actions[] =
 	{ "Next Save Slot   ", 1 << SACTION_NEXT_SSLOT },
 	{ "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
 	{ "Take Screenshot  ", 1 << SACTION_SCREENSHOT },
-	{ "Fast Forward     ", 1 << SACTION_FAST_FORWARD },
+	{ "Show/Hide FPS    ", 1 << SACTION_TOGGLE_FPS },
 #ifdef __ARM_ARCH_7A__
 	{ "Switch Renderer  ", 1 << SACTION_SWITCH_DISPMODE },
 #endif
+	{ "Fast Forward     ", 1 << SACTION_FAST_FORWARD },
 #if MENU_SHOW_MINIMIZE
 	{ "Minimize         ", 1 << SACTION_MINIMIZE },
 #endif