mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-04-23 21:47:14 -04:00
Merge pull request #1819 from nvllsvm/ffmpeg_kill
Ignore exception when attempting to kill ffmpeg that has exited
This commit is contained in:
commit
180fb857ed
1 changed files with 1 additions and 2 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue