Fixed preview bar being added too soon.

1 files changed, 10 insertions, 8 deletions

diff --git a/content.js b/content.js
index a1f4066c..df376d69 100644
--- a/content.js
+++ b/content.js
@@ -28,7 +28,7 @@ var channelURL;
 var channelWhitelisted = false;
 
 // create preview bar
-var previewBar;
+var previewBar = null;
 
 // Direct Links
 videoIDChange(getYouTubeVideoID(document.URL));
@@ -206,7 +206,9 @@ function resetValues() {
     sponsorLookupRetries = 0;
 
     //empty the preview bar
-    previewBar.set([], [], 0);
+    if (previewBar !== null) {
+        previewBar.set([], [], 0);
+    }
 
     //reset sponsor data found check
     sponsorDataFound = false;
@@ -214,11 +216,16 @@ function resetValues() {
 
 function videoIDChange(id) {
     //if the id has not changed return
-    if (sponsorVideoID === id) return
+    if (sponsorVideoID === id) return;
 
     //set the global videoID
     sponsorVideoID = id;
 
+	resetValues();
+	
+	//id is not valid
+    if (!id) return;
+
     //setup the preview bar
     if (previewBar == null) {
         //create it
@@ -226,11 +233,6 @@ function videoIDChange(id) {
         previewBar = new PreviewBar(progressBar);
     }
 
-	resetValues();
-	
-	//id is not valid
-	if (id === false) return;
-
     //warn them if they had unsubmitted times
     if (previousVideoID != null) {
         //get the sponsor times from storage