diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index f2ee8da546..a80aa4d719 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -540,12 +540,6 @@ bool CBoot::BootUp(std::unique_ptr boot) if (!executable.reader->IsValid()) return false; - if (!executable.reader->LoadIntoMemory()) - { - PanicAlertFmtT("Failed to load the executable to memory."); - return false; - } - SetDefaultDisc(); SetupMSR(); @@ -569,6 +563,12 @@ bool CBoot::BootUp(std::unique_ptr boot) SetupGCMemory(); } + if (!executable.reader->LoadIntoMemory()) + { + PanicAlertFmtT("Failed to load the executable to memory."); + return false; + } + SConfig::OnNewTitleLoad(); PC = executable.reader->GetEntryPoint();