diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-22 19:31:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 19:31:33 -0500 |
| commit | 52dd570142b20b48e41c335c3e8e6891b309a830 (patch) | |
| tree | 432dbd921ca780c5486f50459f552180f2af18e4 | |
| parent | 28483bdb54be96ae83e0fded097f534d7e26ba1e (diff) | |
| parent | cce90d2b56821ca24d65d4851645c0337cb8e88a (diff) | |
Merge pull request #671 from Tthecreator/dev
Set EnableRaisingEvents correctly
| -rw-r--r-- | Emby.Server.Implementations/Diagnostics/CommonProcess.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 4 |
2 files changed, 9 insertions, 13 deletions
diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs index d8a798c46..55539eafc 100644 --- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs +++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs @@ -105,26 +105,22 @@ namespace Emby.Server.Implementations.Diagnostics { return _process.WaitForExit(timeMs); } - + public Task<bool> WaitForExitAsync(int timeMs) { - //if (_process.WaitForExit(100)) - //{ - // return Task.FromResult(true); - //} + //Note: For this function to work correctly, the option EnableRisingEvents needs to be set to true. + + if (HasExited) + { + return Task.FromResult(true); + } - //timeMs -= 100; timeMs = Math.Max(0, timeMs); var tcs = new TaskCompletionSource<bool>(); var cancellationToken = new CancellationTokenSource(timeMs).Token; - if (HasExited) - { - return Task.FromResult(true); - } - _process.Exited += (sender, args) => tcs.TrySetResult(true); cancellationToken.Register(() => tcs.TrySetResult(HasExited)); diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 59a624433..2f9eb98ea 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -437,7 +437,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles UseShellExecute = false, FileName = _mediaEncoder.EncoderPath, Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath), - + EnableRaisingEvents = true, IsHidden = true, ErrorDialog = false }); @@ -574,7 +574,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles { CreateNoWindow = true, UseShellExecute = false, - + EnableRaisingEvents = true, FileName = _mediaEncoder.EncoderPath, Arguments = processArgs, IsHidden = true, |