X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=f332f4377aa33f8c197066bf8f5d5468bac74dea;hb=c2eee46bfb8a3fde297735a8b115330498d442b4;hp=da1dbea83241c7bec3089ae7f19945e229a9a3d4;hpb=3faf5c235830d46b111bfc6459f50071b43f6a0d;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index da1dbea8..f332f437 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -22,6 +22,7 @@
 */
 
 #include <stddef.h>
+#include <errno.h>
 #include <assert.h>
 #include "misc.h"
 #include "cdrom.h"
@@ -174,8 +175,13 @@ static void getFromCnf(char *buf, const char *key, u32 *val)
 	buf = strstr(buf, key);
 	if (buf)
 		buf = strchr(buf, '=');
-	if (buf)
-		*val = strtol(buf + 1, NULL, 16);
+	if (buf) {
+		unsigned long v;
+		errno = 0;
+		v = strtoul(buf + 1, NULL, 16);
+		if (errno == 0)
+			*val = v;
+	}
 }
 
 int LoadCdrom() {
@@ -282,7 +288,7 @@ int LoadCdrom() {
 	//psxCpu->Reset();
 
 	if (Config.HLE)
-		psxBiosCheckExe(tmpHead.h.t_addr, tmpHead.h.t_size);
+		psxBiosCheckExe(tmpHead.h.t_addr, tmpHead.h.t_size, 0);
 
 	return 0;
 }
@@ -763,8 +769,9 @@ int LoadState(const char *file) {
 	new_dyna_freeze(f, 0);
 	padFreeze(f, 0);
 
+	events_restore();
 	if (Config.HLE)
-		psxBiosCheckExe(biosBranchCheckOld, 0x60);
+		psxBiosCheckExe(biosBranchCheckOld, 0x60, 1);
 
 	result = 0;
 cleanup: