CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 07:10:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into culture

Browse source
This commit is contained in:
Bond-009 2019-01-30 16:57:15 +01:00 • committed by GitHub
commit 1ea219bf3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
121 changed files with 536 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -434,7 +434,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(Path.GetExtension(subtitlePath), ".sub", StringComparison.OrdinalIgnoreCase))
{
var idxFile = Path.ChangeExtension(subtitlePath, ".idx");
if (_fileSystem.FileExists(idxFile))
if (File.Exists(idxFile))
{
subtitlePath = idxFile;
}
@ -542,7 +542,7 @@ namespace MediaBrowser.Controller.MediaEncoding
// var fallbackFontPath = Path.Combine(_appPaths.ProgramDataPath, "fonts", "DroidSansFallback.ttf");
// string fallbackFontParam = string.Empty;
// if (!_fileSystem.FileExists(fallbackFontPath))
// if (!File.Exists(fallbackFontPath))
// {
// _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(fallbackFontPath));
// using (var stream = _assemblyInfo.GetManifestResourceStream(GetType(), GetType().Namespace + ".DroidSansFallback.ttf"))