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

fix changing between interpreter and JIT not taking place instantly. Fix loading config needlessly twice on app init. Fixes issue 1682 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4604 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-11-23 08:43:14 +00:00
parent 67dee48b3e
commit 37f1e1ca73
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -675,9 +675,11 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
break; break;
case ID_RADIOJIT: case ID_RADIOJIT:
SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = true; SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = true;
if (main_frame->g_pCodeWindow) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, false);
break; break;
case ID_RADIOINT: case ID_RADIOINT:
SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = false; SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = false;
if (main_frame->g_pCodeWindow) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, true);
break; break;
case ID_CPUTHREAD: case ID_CPUTHREAD:
SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked(); SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked();

3
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -358,9 +358,6 @@ bool DolphinApp::OnInit()
// ============ // ============
#endif #endif
// Load CONFIG_FILE settings
SConfig::GetInstance().LoadSettings();
if (selectVideoPlugin && videoPluginFilename != wxEmptyString) if (selectVideoPlugin && videoPluginFilename != wxEmptyString)
{ {
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin = std::string(videoPluginFilename.mb_str()); SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin = std::string(videoPluginFilename.mb_str());