piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Fixed boot settings

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4180 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-09-03 07:59:24 +00:00
parent c82c0b0b93
commit 486798c580
6 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,6 @@
#if defined(HAVE_WX) && HAVE_WX
extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow;
#endif
namespace BootManager
@ -83,21 +82,21 @@ bool BootCore(const std::string& _rFilename)
// Use custom settings for debugging mode
#if defined(HAVE_WX) && HAVE_WX
if (g_pCodeWindow)
if (main_frame->g_pCodeWindow)
{
// StartUp.bUseDualCore = code_frame->UseDualCore();
StartUp.bUseJIT = !g_pCodeWindow->UseInterpreter();
StartUp.bBootToPause = g_pCodeWindow->BootToPause();
StartUp.bAutomaticStart = g_pCodeWindow->AutomaticStart();
StartUp.bJITUnlimitedCache = g_pCodeWindow->UnlimitedJITCache();
StartUp.bJITBlockLinking = g_pCodeWindow->JITBlockLinking();
//StartUp.bUseDualCore = code_frame->UseDualCore();
StartUp.bUseJIT = !main_frame->g_pCodeWindow->UseInterpreter();
StartUp.bBootToPause = main_frame->g_pCodeWindow->BootToPause();
StartUp.bAutomaticStart = main_frame->g_pCodeWindow->AutomaticStart();
StartUp.bJITUnlimitedCache = main_frame->g_pCodeWindow->UnlimitedJITCache();
StartUp.bJITBlockLinking = main_frame->g_pCodeWindow->JITBlockLinking();
}
else
{
// StartUp.bUseDualCore = false;
// StartUp.bUseJIT = true;
//StartUp.bUseDualCore = false;
//StartUp.bUseJIT = true;
}
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
StartUp.bEnableDebugging = main_frame->g_pCodeWindow ? true : false; // RUNNING_DEBUG
#endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
@ -193,8 +192,7 @@ bool BootCore(const std::string& _rFilename)
#if defined(HAVE_WX) && HAVE_WX
// Boot to pause or not
Core::SetState((g_pCodeWindow && StartUp.bBootToPause)
? Core::CORE_PAUSE : Core::CORE_RUN);
Core::SetState((main_frame->g_pCodeWindow && StartUp.bBootToPause) ? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);
#endif