From 89dbec437f3a5e5d4fa3df58c986f186b48555c6 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 15 Mar 2014 00:09:12 -0400 Subject: [PATCH] Save bHLE_BS2 to config cache before it can be changed while booting. This variable can be changed in SConfig::AutoSetup, so we need to save it before that is called. --- Source/Core/Core/BootManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index b23e7cae67..c0e6eb989f 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -76,6 +76,9 @@ bool BootCore(const std::string& _rFilename) StartUp.hInstance = Host_GetInstance(); + // This is saved seperately from everything because it can be changed in SConfig::AutoSetup() + config_cache.bHLE_BS2 = StartUp.bHLE_BS2; + // If for example the ISO file is bad we return here if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) return false; @@ -108,7 +111,6 @@ bool BootCore(const std::string& _rFilename) config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; config_cache.strBackend = StartUp.m_strVideoBackend; - config_cache.bHLE_BS2 = StartUp.bHLE_BS2; config_cache.m_EnableJIT = SConfig::GetInstance().m_DSPEnableJIT; config_cache.bDSPThread = StartUp.bDSPThread; config_cache.Volume = SConfig::GetInstance().m_Volume;