mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05: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
@ -610,9 +610,8 @@ namespace MediaBrowser.Api
|
|||||||
process.Kill();
|
process.Kill();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (InvalidOperationException)
|
||||||
{
|
{
|
||||||
Logger.LogError(ex, "Error killing transcoding job for {Path}", job.Path);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user