Make sure old segment fetch request doesn't get used

May fix #2101 See dbf80b4#r147058589
ajayyy · Sep 23, 2024 · 4c417b1 · 4c417b1
1 parent 36549e7
commit 4c417b1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/content.ts b/src/content.ts
@@ -1133,14 +1133,17 @@ function setupCategoryPill() {
 }
 
 async function sponsorsLookup(keepOldSubmissions = true, ignoreCache = false) {
-    const videoID = getVideoID()
+    const videoID = getVideoID();
     if (!videoID) {
         console.error("[SponsorBlock] Attempted to fetch segments with a null/undefined videoID.");
         return;
     }
 
     const segmentData = await getSegmentsForVideo(videoID, ignoreCache);
 
+    // Make sure an old pending request doesn't get used.
+    if (videoID !== getVideoID()) return;
+
     // store last response status
     lastResponseStatus = segmentData.status;
     if (segmentData.status === 200) {