From a714008b596b108a44020f61ca384b30263df984 Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Wed, 23 Dec 2020 21:00:50 +0100
Subject: Add missing FileStreams

---
 Emby.Server.Implementations/Channels/ChannelManager.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Emby.Server.Implementations/Channels')

diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index b462d7bdcd..3663e5094b 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -341,7 +341,8 @@ namespace Emby.Server.Implementations.Channels
             try
             {
                 using FileStream jsonStream = File.OpenRead(path);
-                return JsonSerializer.DeserializeAsync<List<MediaSourceInfo>>(jsonStream, JsonDefaults.GetOptions()).GetAwaiter().GetResult();
+                return JsonSerializer.DeserializeAsync<List<MediaSourceInfo>>(jsonStream, JsonDefaults.GetOptions()).GetAwaiter().GetResult()
+                    ?? new List<MediaSourceInfo>();
             }
             catch
             {
@@ -810,8 +811,8 @@ namespace Emby.Server.Implementations.Channels
             {
                 if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
                 {
-                    var jsonString = await File.ReadAllTextAsync(cachePath, cancellationToken);
-                    var cachedResult = JsonSerializer.Deserialize<ChannelItemResult>(jsonString);
+                    await using FileStream jsonStream = File.OpenRead(cachePath);
+                    var cachedResult = await JsonSerializer.DeserializeAsync<ChannelItemResult>(jsonStream, JsonDefaults.GetOptions(), cancellationToken).ConfigureAwait(false);
                     if (cachedResult != null)
                     {
                         return null;
@@ -833,8 +834,8 @@ namespace Emby.Server.Implementations.Channels
                 {
                     if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
                     {
-                        var jsonString = await File.ReadAllTextAsync(cachePath, cancellationToken);
-                        var cachedResult = JsonSerializer.Deserialize<ChannelItemResult>(jsonString);
+                        await using FileStream jsonStream = File.OpenRead(cachePath);
+                        var cachedResult = await JsonSerializer.DeserializeAsync<ChannelItemResult>(jsonStream, JsonDefaults.GetOptions(), cancellationToken).ConfigureAwait(false);
                         if (cachedResult != null)
                         {
                             return null;
-- 
cgit v1.2.3