Fix filtered chapter group generation

1 files changed, 20 insertions, 13 deletions

diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts
index f4c3cf9c..308e066f 100644
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -313,19 +313,6 @@ class PreviewBar {
 
         // Merge overlapping chapters
         this.unfilteredChapterGroups = this.createChapterRenderGroups(segments);
-        const filteredSegments = segments?.filter((segment) => this.chapterFilter(segment));
-        if (filteredSegments && filteredSegments.length !== segments.length) {
-            this.chapterGroups = this.createChapterRenderGroups(filteredSegments).filter((segment) => this.chapterGroupFilter(segment));
-
-            // Fix missing sections due to filtered segments
-            for (let i = 1; i < this.chapterGroups.length; i++) {
-                if (this.chapterGroups[i].segment[0] !== this.chapterGroups[i - 1].segment[1]) {
-                    this.chapterGroups[i - 1].segment[1] = this.chapterGroups[i].segment[0]
-                }
-            }
-        } else {
-            this.chapterGroups = this.unfilteredChapterGroups;
-        }
 
         if (segments.every((segments) => segments.source === SponsorSourceType.YouTube) 
             || (!Config.config.renderSegmentsAsChapters 
@@ -337,6 +324,26 @@ class PreviewBar {
             return;
         }
 
+        const filteredSegments = segments?.filter((segment) => this.chapterFilter(segment));
+        if (filteredSegments) {
+            let groups = this.unfilteredChapterGroups;
+            if (filteredSegments.length !== segments.length) {
+                groups = this.createChapterRenderGroups(filteredSegments);
+            }
+            this.chapterGroups = groups.filter((segment) => this.chapterGroupFilter(segment));
+
+            if (groups.length !== this.chapterGroups.length) {
+                // Fix missing sections due to filtered segments
+                for (let i = 1; i < this.chapterGroups.length; i++) {
+                    if (this.chapterGroups[i].segment[0] !== this.chapterGroups[i - 1].segment[1]) {
+                        this.chapterGroups[i - 1].segment[1] = this.chapterGroups[i].segment[0]
+                    }
+                }
+            }
+        } else {
+            this.chapterGroups = this.unfilteredChapterGroups;
+        }
+
         // Create it from cloning
         let createFromScratch = false;
         if (!this.customChaptersBar || !this.progressBar.contains(this.customChaptersBar)) {