diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-29 20:23:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 20:23:19 -0400 |
| commit | 180fb857edfa68aa84ca1f99376d494995721da0 (patch) | |
| tree | 5f2ccf13744a49bea204973ee1c29d95f37a8292 | |
| parent | cb09459ad1a116a9e879d17b57f44b54994162a1 (diff) | |
| parent | fd1bdad0e22715cb589d3bbee9ed9805989ac544 (diff) | |
Merge pull request #1819 from nvllsvm/ffmpeg_kill
Ignore exception when attempting to kill ffmpeg that has exited
| -rw-r--r-- | MediaBrowser.Api/ApiEntryPoint.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index a223a4fe3..7dca7e814 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -610,9 +610,8 @@ namespace MediaBrowser.Api process.Kill(); } } - catch (Exception ex) + catch (InvalidOperationException) { - Logger.LogError(ex, "Error killing transcoding job for {Path}", job.Path); } } } |