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

Fix ffmpeg race condition. (#1841)

This commit is contained in:
Zach 2020-02-18 05:25:52 -08:00 committed by GitHub
parent d3c048c13c
commit 61fff4cbce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
View File

@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
_commandline = $"ffmpeg {_ffmpeg.StartInfo.Arguments}";
_ffmpeg.ErrorDataReceived += new DataReceivedEventHandler(StderrHandler);
_ffmpeg.ErrorDataReceived += StderrHandler;
_stderr = new Queue<string>(Consolebuffer);
@ -137,7 +137,12 @@ namespace BizHawk.Client.EmuHawk
//ffmpeg.StandardInput.Close();
// how long should we wait here?
_ffmpeg.WaitForExit(20000);
if (_ffmpeg.WaitForExit(20000))
{
// Known MS bug: WaitForExit(time) waits for the process to exit but doesn't wait for event handling to finish.
// If WaitForExit(time) returns true, this call waits for message pump to clear out events.
_ffmpeg.WaitForExit();
}
_ffmpeg.Dispose();
_ffmpeg = null;
_stderr = null;