diff options
| author | skidau <skidau@gmail.com> | 2014-09-07 13:41:57 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-09-07 13:41:57 +1000 |
| commit | 741c0e2d509555a0308b6850e9d0c828bc7cfca9 (patch) | |
| tree | ed8e0f341798eb2712e1ebbc081e631cf9784bd0 /Source/Core | |
| parent | 213c9a6ba7236525307cba0850292f79c1138be5 (diff) | |
| parent | 24ca493dd1e65f4ee1dbcd843a7dbc0269e5aa5e (diff) | |
Merge pull request #587 from RachelBryk/recording-race
Don't allow starting recording in states that will cause a crash or othe...
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 489c835baf..b549a96353 100644 --- 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()) |