diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-23 08:43:14 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-23 08:43:14 +0000 |
| commit | 37f1e1ca73596b2f12efba53ef107263bd0eee8c (patch) | |
| tree | 5a21b8c5dfb6a2363f73c26b087bfa41a6ea0747 /Source/Core | |
| parent | 67dee48b3e2b3ab6acdbe210cd135553ef6b990f (diff) | |
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
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 60331b772a..9b90426f53 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -675,9 +675,11 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) break; case ID_RADIOJIT: SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = true; + if (main_frame->g_pCodeWindow) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, false); break; case ID_RADIOINT: SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT = false; + if (main_frame->g_pCodeWindow) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, true); break; case ID_CPUTHREAD: SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked(); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 352dfaf739..66ceb92b5f 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -358,9 +358,6 @@ bool DolphinApp::OnInit() // ============ #endif - // Load CONFIG_FILE settings - SConfig::GetInstance().LoadSettings(); - if (selectVideoPlugin && videoPluginFilename != wxEmptyString) { SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin = std::string(videoPluginFilename.mb_str()); |