Merge pull request #11249 from JosJuice/load-dol-elf-after-mem

Boot: Load DOL/ELF after memory setup
dolphin-emu · Nov 6, 2022 · db679ab · db679ab
2 parents e1f5eb3 + fb916a4
commit db679ab
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
@@ -540,12 +540,6 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> 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<BootParameters> boot)
         SetupGCMemory();
       }
 
+      if (!executable.reader->LoadIntoMemory())
+      {
+        PanicAlertFmtT("Failed to load the executable to memory.");
+        return false;
+      }
+
       SConfig::OnNewTitleLoad();
 
       PC = executable.reader->GetEntryPoint();