Merge pull request #587 from RachelBryk/recording-race

Don't allow starting recording in states that will cause a crash or othe...
dolphin-emu · Sep 7, 2014 · 741c0e2 · 741c0e2
2 parents 213c9a6 + 24ca493
commit 741c0e2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
@@ -707,6 +707,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())