From 74343b427605bf59e6cf1b69dc5e330fac50e905 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Thu, 18 Mar 2021 22:59:59 +0100
Subject: [PATCH] Boot: Move initial UpdateWantDeterminism call earlier

Just to make the InitializeWiiRoot call a bit neater.
---
 Source/Core/Core/BootManager.cpp | 7 ++++---
 Source/Core/Core/Core.cpp        | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 617d51c24d..78b191e1e7 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -433,13 +433,14 @@ bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
   if (StartUp.bWii && DiscIO::IsNTSC(StartUp.m_region) && Config::Get(Config::SYSCONF_PAL60))
     Config::SetCurrent(Config::SYSCONF_PAL60, false);
 
+  Core::UpdateWantDeterminism(/*initial*/ true);
+
   if (StartUp.bWii)
   {
-    const bool want_determinism = Movie::IsMovieActive() || NetPlay::IsNetPlayRunning();
-    Core::InitializeWiiRoot(want_determinism);
+    Core::InitializeWiiRoot(Core::WantsDeterminism());
 
     // Ensure any new settings are written to the SYSCONF
-    if (!want_determinism)
+    if (!Core::WantsDeterminism())
     {
       Core::BackupWiiSettings();
       ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta);
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 2fe18a7e67..6f2007f069 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -231,8 +231,6 @@ bool Init(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
   // Drain any left over jobs
   HostDispatchJobs();
 
-  Core::UpdateWantDeterminism(/*initial*/ true);
-
   INFO_LOG_FMT(BOOT, "Starting core = {} mode", SConfig::GetInstance().bWii ? "Wii" : "GameCube");
   INFO_LOG_FMT(BOOT, "CPU Thread separate = {}", SConfig::GetInstance().bCPUThread ? "Yes" : "No");