X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=d42576c836667c5bfabb1b46a1b62a32d05f12e8;hb=54b375e0d7031d0fae9deb0f7ba815793ae4115e;hp=82e6b8b65dabe2205e02fbe676e16ca3c44a0a3d;hpb=a0cffa0ffa785fbaff1c563627d6ce9dc0523287;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 82e6b8b6..d42576c8 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -392,7 +392,7 @@ int CheckCdrom() {
 	}
 
 	if (CdromLabel[0] == ' ') {
-		strncpy(CdromLabel, CdromId, 9);
+		memcpy(CdromLabel, CdromId, 9);
 	}
 	SysPrintf(_("CD-ROM Label: %.32s\n"), CdromLabel);
 	SysPrintf(_("CD-ROM ID: %.9s\n"), CdromId);
@@ -657,6 +657,11 @@ int LoadState(const char *file) {
 	if (Config.HLE)
 		psxBiosInit();
 
+#if defined(LIGHTREC)
+	if (Config.Cpu != CPU_INTERPRETER)
+		psxCpu->Clear(0, UINT32_MAX); //clear all
+	else
+#endif
 	psxCpu->Reset();
 	SaveFuncs.seek(f, 128 * 96 * 3, SEEK_CUR);
 
@@ -750,7 +755,7 @@ int RecvPcsxInfo() {
 	NET_recvData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
 	if (tmp != Config.Cpu) {
 		psxCpu->Shutdown();
-#ifdef PSXREC
+#if defined(NEW_DYNAREC) || defined(LIGHTREC)
 		if (Config.Cpu == CPU_INTERPRETER) psxCpu = &psxInt;
 		else psxCpu = &psxRec;
 #else