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

diff --git a/frontend/main.c b/frontend/main.c
index f0485845..2d438aa1 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -151,8 +151,8 @@ void emu_set_default_config(void)
 	new_dynarec_hacks = 0;
 	cycle_multiplier = 200;
 
-	in_type1 = PSE_PAD_TYPE_STANDARD;
-	in_type2 = PSE_PAD_TYPE_STANDARD;
+	in_type[0] = PSE_PAD_TYPE_STANDARD;
+	in_type[1] = PSE_PAD_TYPE_STANDARD;
 }
 
 void do_emu_action(void)
@@ -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",
@@ -1030,4 +1030,3 @@ void SysCloseLibrary(void *lib) {
 	dlclose(lib);
 #endif
 }
-