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

Fix a couple race conditions. 

Checks if another game is already starting to boot before starting to boot a new one, and only change video backend, and dual core if a game is actually not running.
This commit is contained in:
Rachel Bryk 2014-05-23 09:45:14 -04:00
parent b58753bd69
commit e6684d17c1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,6 +882,8 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
{ {
// Core - Basic // Core - Basic
case ID_CPUTHREAD: case ID_CPUTHREAD:
if (Core::GetState() != Core::CORE_UNINITIALIZED)
return;
SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked(); SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread = CPUThread->IsChecked();
break; break;
case ID_IDLESKIP: case ID_IDLESKIP:

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -888,6 +888,8 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
// Prepare the GUI to start the game. // Prepare the GUI to start the game.
void CFrame::StartGame(const std::string& filename) void CFrame::StartGame(const std::string& filename)
{ {
if (m_bGameLoading)
return;
m_bGameLoading = true; m_bGameLoading = true;
if (m_ToolBar) if (m_ToolBar)

3
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -20,6 +20,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/SysConf.h" #include "Common/SysConf.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h" #include "Core/CoreParameter.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
@ -85,7 +86,7 @@ protected:
VideoBackend* new_backend = g_available_video_backends[ev.GetInt()]; VideoBackend* new_backend = g_available_video_backends[ev.GetInt()];
if (g_video_backend != new_backend) if (g_video_backend != new_backend)
{ {
bool do_switch = true; bool do_switch = Core::GetState() == Core::CORE_UNINITIALIZED;
if (new_backend->GetName() == "Software Renderer") if (new_backend->GetName() == "Software Renderer")
{ {
do_switch = (wxYES == wxMessageBox(_("Software rendering is an order of magnitude slower than using the other backends.\nIt's only useful for debugging purposes.\nDo you really want to enable software rendering? If unsure, select 'No'."), do_switch = (wxYES == wxMessageBox(_("Software rendering is an order of magnitude slower than using the other backends.\nIt's only useful for debugging purposes.\nDo you really want to enable software rendering? If unsure, select 'No'."),