System: Fix per-game fast boot applying too late

stenzek · Oct 30, 2024 · 2043128 · 2043128
1 parent d24e8fd
commit 2043128
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/core/system.cpp b/src/core/system.cpp
@@ -1717,16 +1717,6 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
                       Settings::GetDiscRegionName(disc_region), Settings::GetConsoleRegionName(s_state.region));
         }
       }
-
-      const bool wants_fast_boot =
-        parameters.override_fast_boot.value_or(static_cast<bool>(g_settings.bios_patch_fast_boot));
-      if (wants_fast_boot)
-      {
-        if (disc_region == DiscRegion::NonPS1)
-          ERROR_LOG("Not fast booting non-PS1 disc.");
-        else
-          boot_mode = BootMode::FastBoot;
-      }
     }
   }
   else
@@ -1802,6 +1792,13 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
     }
   }
 
+  // Are we fast booting? Must be checked after updating game settings.
+  if (boot_mode == BootMode::FullBoot && disc_region != DiscRegion::NonPS1 &&
+      parameters.override_fast_boot.value_or(static_cast<bool>(g_settings.bios_patch_fast_boot)))
+  {
+    boot_mode = BootMode::FastBoot;
+  }
+
   // Load BIOS image, component setup, check for subchannel in games that need it.
   if (!SetBootMode(boot_mode, disc_region, error) ||
       !Initialize(std::move(disc), disc_region, parameters.force_software_renderer,