From d1c2d5ddc48fdb9eaa7b81dfa7a19ccb1564692b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 2 Feb 2013 18:46:23 -0800 Subject: [PATCH] Loading a savestate crashed with active mipscalls. --- Core/HLE/sceKernelThread.cpp | 7 ++++++- Core/HLE/sceKernelThread.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 43169ed2bf..c3fecf53e9 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -231,12 +231,17 @@ private: class ActionAfterMipsCall : public Action { + ActionAfterMipsCall() + { + chainedAction = NULL; + } + public: virtual void run(MipsCall &call); static Action *Create() { - return new ActionAfterMipsCall; + return new ActionAfterMipsCall(); } virtual void DoState(PointerWrap &p) diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index fc1071a8da..74bb71d828 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -208,6 +208,11 @@ int __KernelRegisterActionType(ActionCreator creator); void __KernelRestoreActionType(int actionType, ActionCreator creator); struct MipsCall { + MipsCall() + { + doAfter = NULL; + } + u32 entryPoint; u32 cbId; u32 args[6];