ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Boot: Move initial UpdateWantDeterminism call earlier 

Just to make the InitializeWiiRoot call a bit neater.
This commit is contained in:
JosJuice 2021-03-18 22:59:59 +01:00
parent 1dfeb73589
commit 74343b4276
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/BootManager.cpp
View File

@ -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)) if (StartUp.bWii && DiscIO::IsNTSC(StartUp.m_region) && Config::Get(Config::SYSCONF_PAL60))
Config::SetCurrent(Config::SYSCONF_PAL60, false); Config::SetCurrent(Config::SYSCONF_PAL60, false);
Core::UpdateWantDeterminism(/*initial*/ true);
if (StartUp.bWii) if (StartUp.bWii)
{ {
const bool want_determinism = Movie::IsMovieActive() || NetPlay::IsNetPlayRunning(); Core::InitializeWiiRoot(Core::WantsDeterminism());
Core::InitializeWiiRoot(want_determinism);
// Ensure any new settings are written to the SYSCONF // Ensure any new settings are written to the SYSCONF
if (!want_determinism) if (!Core::WantsDeterminism())
{ {
Core::BackupWiiSettings(); Core::BackupWiiSettings();
ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta); ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta);

2
Source/Core/Core/Core.cpp
View File

@ -231,8 +231,6 @@ bool Init(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
// Drain any left over jobs // Drain any left over jobs
HostDispatchJobs(); HostDispatchJobs();
Core::UpdateWantDeterminism(/*initial*/ true);
INFO_LOG_FMT(BOOT, "Starting core = {} mode", SConfig::GetInstance().bWii ? "Wii" : "GameCube"); INFO_LOG_FMT(BOOT, "Starting core = {} mode", SConfig::GetInstance().bWii ? "Wii" : "GameCube");
INFO_LOG_FMT(BOOT, "CPU Thread separate = {}", SConfig::GetInstance().bCPUThread ? "Yes" : "No"); INFO_LOG_FMT(BOOT, "CPU Thread separate = {}", SConfig::GetInstance().bCPUThread ? "Yes" : "No");