mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-15 23:58:57 +00:00
Merge pull request #1819 from nvllsvm/ffmpeg_kill
Ignore exception when attempting to kill ffmpeg that has exited
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user