aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Emby.Server.Implementations/Library/LiveStreamHelper.cs23
1 files changed, 14 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index 59d705ace..d41845cdf 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -48,20 +48,25 @@ namespace Emby.Server.Implementations.Library
if (!string.IsNullOrEmpty(cacheKey))
{
- FileStream jsonStream = AsyncFile.OpenRead(cacheFilePath);
try
{
- mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+ FileStream jsonStream = AsyncFile.OpenRead(cacheFilePath);
- // _logger.LogDebug("Found cached media info");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Error deserializing mediainfo cache");
+ try
+ {
+ mediaInfo = await JsonSerializer.DeserializeAsync<MediaInfo>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false);
+ // _logger.LogDebug("Found cached media info");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Error deserializing mediainfo cache");
+ }
+
+ await jsonStream.DisposeAsync().ConfigureAwait(false);
}
- finally
+ catch
{
- await jsonStream.DisposeAsync().ConfigureAwait(false);
+ _logger.LogError("Could not open cached media info");
}
}