aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Walton <ian@iwalton.com>2020-03-23 12:39:12 -0400
committerIan Walton <ian@iwalton.com>2020-03-23 12:39:12 -0400
commit4836d1674bdc076431c0ac18171c1b97c7e254ce (patch)
treeb13f468d9f6e2f36a3cf16e872b43bf847d406ed
parentda4855ce4f590d7dc60b81bbf841e58f9220aac3 (diff)
Don't return closed stream for subtitles. (jellyfin/jellyfin#2650)
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 72db56974..6284e0fd9 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -183,9 +183,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
private async Task<Stream> GetSubtitleStream(string path, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
{
- using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
+ if (requiresCharset)
{
- if (requiresCharset)
+ using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
{
var result = CharsetDetector.DetectFromStream(stream).Detected;
stream.Position = 0;
@@ -200,9 +200,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return new MemoryStream(Encoding.UTF8.GetBytes(text));
}
}
-
- return stream;
}
+
+ return File.OpenRead(path);
}
private async Task<SubtitleInfo> GetReadableFile(