summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-02-28 15:57:41 +1100
committerskidau <skidau@gmail.com>2015-03-08 20:27:12 +1100
commitd080632527de87eb39296bef5e77d05256f48643 (patch)
tree0b578dc1a705c96a5897e58440d9b4fb5814d738 /Source
parent679d9351eadda908a3056994f26ef0db0eaecddd (diff)
Ignore the File Open command if a game is running
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 5ae3e62076..7ab7e9523c 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -686,7 +686,8 @@ void CFrame::BootGame(const std::string& filename)
// Open file to boot
void CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
{
- DoOpen(true);
+ if (Core::GetState() == Core::CORE_UNINITIALIZED)
+ DoOpen(true);
}
void CFrame::DoOpen(bool Boot)