summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-05-23 09:45:14 -0400
committerRachel Bryk <RachelBryk@gmail.com>2014-05-23 10:22:00 -0400
commite6684d17c159c20b9754b19f2cc22222584f50c3 (patch)
treeb6ed4b7c3be3b5acce92db7ef3287d186d651ff0 /Source/Core/DolphinWX/FrameTools.cpp
parentb58753bd692d0634e950af9b273bbfb24564d0dd (diff)
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.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 999243077d..23d09e345d 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -888,6 +888,8 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
// Prepare the GUI to start the game.
void CFrame::StartGame(const std::string& filename)
{
+ if (m_bGameLoading)
+ return;
m_bGameLoading = true;
if (m_ToolBar)