diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-05 01:40:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-05 01:40:21 -0400 |
| commit | 39e76879211503b748bb60a32ef6c89973bd5acb (patch) | |
| tree | 73073665df1c02114e468d17d83923c620ed0f3c /MediaBrowser.MediaEncoding/Encoder | |
| parent | 59ae26431a0ab2b4bf5f68b331b8e54e155fb83a (diff) | |
| parent | cc7b150b90e238286121d58e618d4f8f7c2b6c49 (diff) | |
Merge pull request #2140 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index ad84ffee8..75d85cd32 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -928,7 +928,12 @@ namespace MediaBrowser.MediaEncoding.Encoder { StartProcess(processWrapper); - ranToCompletion = process.WaitForExit(10000); + var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs; + if (timeoutMs <= 0) + { + timeoutMs = 10000; + } + ranToCompletion = process.WaitForExit(timeoutMs); if (!ranToCompletion) { |