X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=f3d4d6361f132072275e00c969df70b6843b9a54;hp=333bdb6c076d87d39891b99355454f6b43c010e3;hb=e4c83ca67cf7ad13db3995909605ce01ff915824;hpb=2c5d0a55b2b48b33f6d15b59d6f04a06c90b2ab5

diff --git a/frontend/menu.c b/frontend/menu.c
index 333bdb6c..f3d4d636 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -34,7 +34,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/main.h"
+#include "../plugins/dfinput/externals.h"
 #include "../plugins/gpulib/cspace.h"
 #include "revision.h"
 
@@ -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
@@ -1849,7 +1856,7 @@ static int run_cd_image(const char *fname)
 		return -1;
 	}
 
-	emu_on_new_cd();
+	emu_on_new_cd(1);
 	ready_to_go = 1;
 
 	return 0;