From 9da2635d86727a260d986a864542ab126f2fd9a6 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Tue, 24 Mar 2020 22:04:16 +0100
Subject: [PATCH] Merge pull request #2653 from iwalton3/fix-embedded-subtitles

Fix embedded mkv subtitles.

(cherry picked from commit 1345e699fae6e29b4507c5ed3dbddd36523a5e0d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 72db569744..6284e0fd9e 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(