diff options
| author | skidau <skidau@gmail.com> | 2014-11-04 12:30:48 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-11-04 12:30:48 +1100 |
| commit | dc63f8f46185ee32c56701837ee2dcf08692657d (patch) | |
| tree | 251b50a22b4b4506d4fef7558b2c7b2374484737 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 80d60c8c4463f1449b4c2e3a442aab8fc99794e4 (diff) | |
| parent | f9495a484ced8088e1f8ca00f05bde2eecf9c347 (diff) | |
Merge pull request #1471 from RachelBryk/reset-record
Allow hard resets to be recorded in movies.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 7b75a212b6..c7c129fbf2 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1306,6 +1306,8 @@ void CFrame::OnStop(wxCommandEvent& WXUNUSED (event)) void CFrame::OnReset(wxCommandEvent& WXUNUSED (event)) { + if (Movie::IsRecordingInput()) + Movie::g_bReset = true; ProcessorInterface::ResetButton_Tap(); } |