From 329b1884358b783c652fcbc3b23d3677ed490b8d Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Thu, 27 Feb 2020 22:23:33 -0500
Subject: [PATCH 1/4] Checkout before using other CI

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1bb05345..2947d9ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,6 +10,7 @@ jobs:
 
     steps:
       # Build Artifacts
+      - uses: actions/checkout@v1
       - name: Build Artifacts
         uses: ./.github/workflows/ci
 

From 0241e15691de06820697b187d772b700c88bd82c Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Fri, 28 Feb 2020 15:06:08 -0500
Subject: [PATCH 2/4] Only seek if the video is not paused

---
 src/content.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/content.ts b/src/content.ts
index 65a31f6b..be4456d8 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -493,8 +493,10 @@ function sponsorsLookup(id: string, channelIDPromise?) {
     if (!seekListenerSetUp && !Config.config.disableSkipping) {
         seekListenerSetUp = true;
 
-        video.addEventListener('seeked', () => startSponsorSchedule());
         video.addEventListener('play', () => startSponsorSchedule());
+        video.addEventListener('seeked', () => {
+            if (!video.paused) startSponsorSchedule()
+        });
         video.addEventListener('ratechange', () => startSponsorSchedule());
         video.addEventListener('seeking', cancelSponsorSchedule);
         video.addEventListener('pause', cancelSponsorSchedule);

From a484f2f2ccb6b01b0b3a32176bf491d108d53b03 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sun, 8 Mar 2020 23:16:09 -0400
Subject: [PATCH 3/4] Fixed double sponsor skip for zero second sponsors

---
 src/content.ts | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index be4456d8..16f732ea 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -44,8 +44,8 @@ var lastPreviewBarUpdate;
 //whether the duration listener listening for the duration changes of the video has been setup yet
 var durationListenerSetUp = false;
 
-// Has a zero second sponsor been skipped yet
-var skippedZeroSecond = false;
+// Is the video currently being switched
+var switchingVideos = false;
 
 //the channel this video is about
 var channelURL;
@@ -250,8 +250,6 @@ function resetValues() {
 
     //reset sponsor data found check
     sponsorDataFound = false;
-
-    skippedZeroSecond = false;
 }
 
 async function videoIDChange(id) {
@@ -266,6 +264,8 @@ async function videoIDChange(id) {
 	//id is not valid
     if (!id) return;
 
+    switchingVideos = true;
+
     // Wait for options to be ready
     await utils.wait(() => Config.config !== null, 5000, 1);
 
@@ -460,8 +460,6 @@ function startSponsorSchedule(currentTime?: number): void {
 
     let skippingFunction = () => {
         if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
-            if (currentTime == 0) skippedZeroSecond = true;
-
             skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
         }
 
@@ -493,9 +491,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
     if (!seekListenerSetUp && !Config.config.disableSkipping) {
         seekListenerSetUp = true;
 
-        video.addEventListener('play', () => startSponsorSchedule());
+        video.addEventListener('play', () => {
+            switchingVideos = false;
+            startSponsorSchedule();
+        });
         video.addEventListener('seeked', () => {
-            if (!video.paused) startSponsorSchedule()
+            if (!video.paused) startSponsorSchedule();
         });
         video.addEventListener('ratechange', () => startSponsorSchedule());
         video.addEventListener('seeking', cancelSponsorSchedule);
@@ -571,10 +572,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
                 }
             }
 
-            if (zeroSecondSponsor && !skippedZeroSecond) {
-                startSponsorSchedule(0);
-            } else {
-                startSponsorSchedule();
+            if (!video.paused && !switchingVideos) {
+                if (zeroSecondSponsor) {
+                    startSponsorSchedule(0);
+                } else {
+                    startSponsorSchedule();
+                }
             }
 
             // Reset skip save

From ae94811a0024fd106cdf2d1dd0ceec4f9fece7cf Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sun, 8 Mar 2020 23:16:50 -0400
Subject: [PATCH 4/4] Increase version number

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 9b46873a..81387422 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "__MSG_Name__",
-    "version": "1.2.17",
+    "version": "1.2.18",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "content_scripts": [{