From 0d2e645cb2c09f61a6de95c3f1702ed2a66f15ff Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 30 May 2019 19:37:18 -0400 Subject: [PATCH] core: Initialize cheats after load to avoid VMManager crash This used to occur due to the VMManager being nullptr at the time cheats were registered (during load, but before it was done). This is bypassed by not accessing the VMManager for offset data until load is complete, --- src/core/core.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/core.cpp b/src/core/core.cpp index 67ec8d4b98..fc70394213 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -205,6 +205,11 @@ struct System::Impl { gpu_core->Start(); cpu_core_manager.StartThreads(); + // Initialize cheat engine + if (cheat_engine) { + cheat_engine->Initialize(); + } + // All threads are started, begin main process execution, now that we're in the clear. main_process->Run(load_parameters->main_thread_priority, load_parameters->main_thread_stack_size);