diff --git a/Core/System.cpp b/Core/System.cpp index 6a14adb07c..5fbe8b9632 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -356,6 +356,11 @@ static bool CPU_Init(FileLoader *fileLoader, IdentifiedFileType type, std::strin g_CoreParameter.gpuCore = GPUCORE_SOFTWARE; } + // This must be before Memory::Init because plugins can override the memory size. + if (type != IdentifiedFileType::PPSSPP_GE_DUMP) { + HLEPlugins::Init(); + } + // Initialize the memory map as early as possible (now that we've read the PARAM.SFO). if (!Memory::Init()) { // We're screwed. @@ -365,9 +370,6 @@ static bool CPU_Init(FileLoader *fileLoader, IdentifiedFileType type, std::strin InitVFPU(); - if (type != IdentifiedFileType::PPSSPP_GE_DUMP) - HLEPlugins::Init(); - LoadSymbolsIfSupported(); mipsr4k.Reset();