ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #587 from RachelBryk/recording-race 

Don't allow starting recording in states that will cause a crash or othe...
This commit is contained in:
skidau 2014-09-07 13:41:57 +10:00
parent 213c9a6ba7 24ca493dd1
commit 741c0e2d50
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -707,6 +707,9 @@ void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
{ {
if ((!Core::IsRunningAndStarted() && Core::IsRunning()) || Movie::IsRecordingInput() || Movie::IsPlayingInput())
return;
int controllers = 0; int controllers = 0;
if (Movie::IsReadOnly()) if (Movie::IsReadOnly())