From 59d8d9a82c8c16e9eab03eba211e9df9c13a8cc1 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 4 Jan 2019 18:46:52 +0100
Subject: [PATCH] Fix nullrefexception in SubtitleEncoder

---
 .../Library/MediaSourceManager.cs                   |  4 ++--
 .../Subtitles/SubtitleEncoder.cs                    | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index e5fd289979..ddda4b2c39 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -160,9 +160,9 @@ namespace Emby.Server.Implementations.Library
                 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))
                     {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 43f7753927..a1dc9b7d4a 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -37,7 +37,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         private readonly IProcessFactory _processFactory;
         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;
             _logger = logger;
@@ -46,6 +56,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             _mediaEncoder = mediaEncoder;
             _json = json;
             _httpClient = httpClient;
+            _mediaSourceManager = mediaSourceManager;
             _processFactory = processFactory;
             _textEncoding = textEncoding;
         }