diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-17 01:06:46 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-17 01:06:46 +0100 |
| commit | 4a906fdf7bcdeb5137828c27ebb0205ec7c1f45a (patch) | |
| tree | 548f6d08c92f31855e2c14fcc03bf556731f5da6 /Source/Core | |
| parent | fe37a772a467d4d6ef811b7bb402f9be18f3a217 (diff) | |
| parent | 89dbec437f3a5e5d4fa3df58c986f186b48555c6 (diff) | |
Merge pull request #170 from RachelBryk/save-skip-bios
Save bHLE_BS2 to config cache before it can be changed while booting.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/BootManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |
