piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for r6337: don't restore cached settings if a gameconfig was not used.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6340 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2010-11-04 12:50:44 +00:00
parent de62a190f1
commit 45c92d27f2
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -67,7 +67,7 @@ namespace BootManager
// Apply fire liberally // Apply fire liberally
struct ConfigCache struct ConfigCache
{ {
bool bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT, bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT,
bAlternateRFI, bFastDiscSpeed, bMergeBlocks; bAlternateRFI, bFastDiscSpeed, bMergeBlocks;
int iTLBHack; int iTLBHack;
}; };
@ -112,6 +112,7 @@ bool BootCore(const std::string& _rFilename)
StartUp.m_strGameIni = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + unique_id + ".ini"; StartUp.m_strGameIni = std::string(File::GetUserPath(D_GAMECONFIG_IDX)) + unique_id + ".ini";
if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str())) if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str()))
{ {
config_cache.valid = true;
config_cache.bCPUThread = StartUp.bCPUThread; config_cache.bCPUThread = StartUp.bCPUThread;
config_cache.bSkipIdle = StartUp.bSkipIdle; config_cache.bSkipIdle = StartUp.bSkipIdle;
config_cache.bEnableFPRF = StartUp.bEnableFPRF; config_cache.bEnableFPRF = StartUp.bEnableFPRF;
@ -170,15 +171,19 @@ void Stop()
SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
StartUp.bCPUThread = config_cache.bCPUThread; if (config_cache.valid)
StartUp.bSkipIdle = config_cache.bSkipIdle; {
StartUp.bEnableFPRF = config_cache.bEnableFPRF; config_cache.valid = false;
StartUp.bMMU = config_cache.bMMU; StartUp.bCPUThread = config_cache.bCPUThread;
StartUp.bMMUBAT = config_cache.bMMUBAT; StartUp.bSkipIdle = config_cache.bSkipIdle;
StartUp.iTLBHack = config_cache.iTLBHack; StartUp.bEnableFPRF = config_cache.bEnableFPRF;
StartUp.bAlternateRFI = config_cache.bAlternateRFI; StartUp.bMMU = config_cache.bMMU;
StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; StartUp.bMMUBAT = config_cache.bMMUBAT;
StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.iTLBHack = config_cache.iTLBHack;
StartUp.bAlternateRFI = config_cache.bAlternateRFI;
StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed;
StartUp.bMergeBlocks = config_cache.bMergeBlocks;
}
} }
} // namespace } // namespace