Merge branch 'master' into removeGlobalSubtitleConfiguration

1 files changed, 3 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index 3d288b9f86..2702e3bc09 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -27,10 +27,9 @@ namespace MediaBrowser.Controller.MediaEncoding
                 using (target)
                 using (reader)
                 {
-                    while (!reader.EndOfStream && reader.BaseStream.CanRead)
+                    string line = await reader.ReadLineAsync().ConfigureAwait(false);
+                    while (line is not null && reader.BaseStream.CanRead)
                     {
-                        var line = await reader.ReadLineAsync().ConfigureAwait(false);
-
                         ParseLogLine(line, state);
 
                         var bytes = Encoding.UTF8.GetBytes(Environment.NewLine + line);
@@ -50,6 +49,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                         }
 
                         await target.FlushAsync().ConfigureAwait(false);
+                        line = await reader.ReadLineAsync().ConfigureAwait(false);
                     }
                 }
             }