Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-29 16:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1819 from nvllsvm/ffmpeg_kill

Browse source 
Ignore exception when attempting to kill ffmpeg that has exited
This commit is contained in:
Joshua M. Boniface 2019-09-29 20:23:19 -04:00 committed by GitHub
commit 180fb857ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MediaBrowser.Api/ApiEntryPoint.cs
View file

@ -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);
}
}
}