From 43d4b7ef18cdf3ac675c3c8cf12979c38615fc69 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Thu, 15 Sep 2022 12:10:39 -0400
Subject: [PATCH] Fix segments not available when hover preview -> click on
 same video

---
 src/content.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index 6be2951f..dde63453 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -338,6 +338,7 @@ function resetValues() {
     existingChaptersImported = false;
     sponsorSkipped = [];
 
+    sponsorVideoID = null;
     videoInfo = null;
     pageType = null;
     channelWhitelisted = false;
@@ -379,10 +380,8 @@ async function videoIDChange(id): Promise<void> {
     //if the id has not changed return unless the video element has changed
     if (sponsorVideoID === id && (isVisible(video) || !video)) return;
 
-    //set the global videoID
-    sponsorVideoID = id;
-
     resetValues();
+    sponsorVideoID = id;
 
 	//id is not valid
     if (!id) return;
@@ -2203,8 +2202,7 @@ function windowListenerHandler(event: MessageEvent): void {
     const dataType = data.type;
     if (data.source !== "sponsorblock") return;
 
-    if (dataType === "navigation") {
-        sponsorVideoID = data.videoID;
+    if (dataType === "navigation" && data.videoID) {
         pageType = data.pageType;
 
         if (data.channelID) {
@@ -2213,17 +2211,17 @@ function windowListenerHandler(event: MessageEvent): void {
                 status: ChannelIDStatus.Found
             };
         }
+
+        videoIDChange(data.videoID);
     } else if (dataType === "ad") {
         if (isAdPlaying != data.playing) {
             isAdPlaying = data.playing
             updatePreviewBar();
             updateVisibilityOfPlayerControlsButton();
         }
-    } else if (dataType === "data") {
-        if (data.video !== sponsorVideoID) {
-            sponsorVideoID = data.videoID;
-            videoIDChange(sponsorVideoID);
-        }
+    } else if (dataType === "data" && data.videoID) {
+        videoIDChange(data.videoID);
+
         isLivePremiere = data.isLive || data.isPremiere
     }
 }