From 37f1e1ca73596b2f12efba53ef107263bd0eee8c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 23 Nov 2009 08:43:14 +0000 Subject: [PATCH] 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 --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 ++ 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());