Fix TsMerger M3U8 support (lay295#1084)

ScrubN · Jun 8, 2024 · 69e480c · 69e480c
1 parent 25410bb
commit 69e480c
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/TwitchDownloaderCore/TsMerger.cs b/TwitchDownloaderCore/TsMerger.cs
@@ -27,6 +27,7 @@ public async Task MergeAsync(CancellationToken cancellationToken)
             }
 
             var isM3U8 = false;
+            var isFirst = true;
             var fileList = new List<string>();
             await using (var fs = File.Open(mergeOptions.InputFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
@@ -35,14 +36,11 @@ public async Task MergeAsync(CancellationToken cancellationToken)
                 {
                     if (string.IsNullOrWhiteSpace(line)) continue;
 
-                    if (isM3U8)
-                    {
-                        if (line.StartsWith('#')) continue;
-                    }
-                    else
-                    {
-                        if (line.StartsWith("#EXTM3U")) isM3U8 = true;
-                    }
+                    if (isFirst && line.StartsWith("#EXTM3U")) isM3U8 = true;
+
+                    isFirst = false;
+
+                    if (isM3U8 && line.StartsWith('#')) continue;
 
                     fileList.Add(line);
                 }