add null check to subtitle task

1 files changed, 9 insertions, 3 deletions

diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index 2490f7145..dd8802689 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly ISubtitleManager _subtitleManager;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly ILogger _logger;
-        private IJsonSerializer _json;
+        private readonly IJsonSerializer _json;
 
         public SubtitleScheduledTask(ILibraryManager libraryManager, IJsonSerializer json, IServerConfigurationManager config, ISubtitleManager subtitleManager, ILogger logger, IMediaSourceManager mediaSourceManager)
         {
@@ -138,12 +138,18 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             try
             {
-                return _json.DeserializeFromFile<Dictionary<string, DateTime>>(path);
+                var result = _json.DeserializeFromFile<Dictionary<string, DateTime>>(path);
+
+                if (result != null)
+                {
+                    return result;
+                }
             }
             catch
             {
-                return new Dictionary<string, DateTime>();
             }
+
+            return new Dictionary<string, DateTime>();
         }
 
         private async Task<bool> DownloadSubtitles(Video video, SubtitleOptions options, CancellationToken cancellationToken)