diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-06-07 01:10:51 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-06-07 01:10:51 -0500 |
| commit | 7d12a31cc255a49d76e2ba62bf176c3059718257 (patch) | |
| tree | 78f092a379cfd9e2b734cca177685b33cce4f23a /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | b591184e4b1510b92444c810e918b0c5001e656f (diff) | |
| parent | e6684d17c159c20b9754b19f2cc22222584f50c3 (diff) | |
Merge pull request #395 from RachelBryk/race
Fix a couple race conditions.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index e9da74c5fa..34fe0bf221 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -908,6 +908,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) |