Merge pull request #12260 from Pokechu22/multiple-fifo-recording-regression

Fix regression when recording multiple fifologs
This commit is contained in:
Admiral H. Curtiss 2023-11-01 12:01:52 +01:00 committed by GitHub
commit 17122f171a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions

View File

@ -261,7 +261,11 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
OpcodeDecoder::g_record_fifo_data = IsRecording(); OpcodeDecoder::g_record_fifo_data = IsRecording();
if (!OpcodeDecoder::g_record_fifo_data) if (!OpcodeDecoder::g_record_fifo_data)
{
// Remove this frame end callback when recording finishes
m_end_of_frame_event.reset();
return; return;
}
if (!was_recording) if (!was_recording)
{ {
@ -430,9 +434,6 @@ void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
m_SkipFutureData = true; m_SkipFutureData = true;
// Signal video backend that it should not call this function when the next frame ends // Signal video backend that it should not call this function when the next frame ends
m_IsRecording = false; m_IsRecording = false;
// Remove our frame end callback
m_end_of_frame_event.reset();
} }
} }