github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 22:17:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #409 from Bond-009/fix254

Browse source 
[Fix #254] Fix nullrefexception in SubtitleEncoder
This commit is contained in:
Vasily 2019-01-06 03:09:12 +03:00 • committed by GitHub
commit 73c6a3f29a
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Emby.Server.Implementations/Library/MediaSourceManager.cs
View file

@ -160,9 +160,9 @@ namespace Emby.Server.Implementations.Library
list.Add(source); list.Add(source);
} }
foreach (var source in list) if (user != null)
{ {
if (user != null) foreach (var source in list)
{ {
if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase)) if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase))
{ {

13
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View file

@ -37,7 +37,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
private readonly IProcessFactory _processFactory; private readonly IProcessFactory _processFactory;
private readonly ITextEncoding _textEncoding; private readonly ITextEncoding _textEncoding;
public SubtitleEncoder(ILibraryManager libraryManager, ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem, IMediaEncoder mediaEncoder, IJsonSerializer json, IHttpClient httpClient, IMediaSourceManager mediaSourceManager, IProcessFactory processFactory, ITextEncoding textEncoding) public SubtitleEncoder(
ILibraryManager libraryManager,
ILogger logger,
IApplicationPaths appPaths,
IFileSystem fileSystem,
IMediaEncoder mediaEncoder,
IJsonSerializer json,
IHttpClient httpClient,
IMediaSourceManager mediaSourceManager,
IProcessFactory processFactory,
ITextEncoding textEncoding)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;
_logger = logger; _logger = logger;
@ -46,6 +56,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
_mediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
_json = json; _json = json;
_httpClient = httpClient; _httpClient = httpClient;
_mediaSourceManager = mediaSourceManager;
_processFactory = processFactory; _processFactory = processFactory;
_textEncoding = textEncoding; _textEncoding = textEncoding;
} }