From 2f4dfedaa9477c16294832c644b42ee91a9d45e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 31 Oct 2020 18:27:26 +0100
Subject: [PATCH] Fix loading old savestates.

Was broken in #13592
---
 Core/HLE/sceKernelModule.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index 26d5ef0dce..9929fc19a1 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -282,10 +282,9 @@ public:
 			DoArray(p, ptemp, 0xC0);
 			memcpy(pnm, ptemp, 0x2C);
 			pnm->modid = GetUID();
-			pnm += 0x30;
-			ptemp += 0x2C;
-			memcpy(pnm, ptemp, 0xC0 - 0x2C);
+			memcpy(((uint8_t *)pnm) + 0x30, ((uint8_t *)ptemp) + 0x2C, 0xC0 - 0x2C);
 		}
+
 		Do(p, memoryBlockAddr);
 		Do(p, memoryBlockSize);
 		Do(p, isFake);
@@ -424,7 +423,7 @@ public:
 		return impExpModuleNames.find(moduleName) != impExpModuleNames.end();
 	}
 
-	NativeModule nm;
+	NativeModule nm{};
 	std::vector<ModuleWaitingThread> waitingThreads;
 
 	std::vector<FuncSymbolExport> exportedFuncs;