@vtytar fixed auto-setup failing if taking too long to load. Fixes #2386

. Closes #3233.
videojs · Apr 4, 2016 · 68bb36e · 68bb36e
1 parent dc3fc68
commit 68bb36e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* @vtytar fixed auto-setup failing if taking too long to load ([view](http://github.com/videojs/video.js/pull/3233))
 
 --------------------
 

diff --git a/src/js/setup.js b/src/js/setup.js
@@ -72,7 +72,10 @@ var autoSetup = function(){
 
 // Pause to let the DOM keep processing
 var autoSetupTimeout = function(wait, vjs){
-  videojs = vjs;
+  if (vjs) {
+    videojs = vjs;
+  }
+
   setTimeout(autoSetup, wait);
 };