X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=2d438aa11e54c2df201bd1abb2ac8470cd5bdd20;hb=f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10;hp=89e96e4a9893748089baf70109ace9b52ebf6fc5;hpb=05311a18fb23799776f9552614ef4c5fb5d852fa;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index 89e96e4a..2d438aa1 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -721,10 +721,10 @@ void SysReset() {
 	// reset can run code, timing must be set
 	pl_timing_prepare(Config.PsxType);
 
-	EmuReset();
-
-	// hmh core forgets this
+   // hmh core forgets this
 	CDR_stop();
+   
+	EmuReset();
 
 	GPU_updateLace = real_lace;
 	g_emu_resetting = 0;
@@ -772,7 +772,7 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
-#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */
 	sync();
 #endif
 	SysPrintf("* %s \"%s\" [%d]\n",