summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-07-08 17:18:37 -0400
committerRachel Bryk <RachelBryk@gmail.com>2014-07-08 17:18:37 -0400
commit24ca493dd1e65f4ee1dbcd843a7dbc0269e5aa5e (patch)
treeff7e2e82c916d9bdc735adfd13dd3805e4e7f84a /Source/Core/DolphinWX/FrameTools.cpp
parent1f25f3c1c96f59ca7122f59d52474df9dc04b3ab (diff)
Don't allow starting recording in states that will cause a crash or other problem.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 6548deb5f0..b2e060df14 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -747,6 +747,9 @@ void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
{
+ if ((!Core::IsRunningAndStarted() && Core::IsRunning()) || Movie::IsRecordingInput() || Movie::IsPlayingInput())
+ return;
+
int controllers = 0;
if (Movie::IsReadOnly())