From 0892d69ba20f5d419655a8cacc450d7850abf336 Mon Sep 17 00:00:00 2001
From: Sam Potts <sam@potts.es>
Date: Wed, 1 Aug 2018 13:56:49 +1000
Subject: Handle race condition for ads lib loading after source change

---
 src/js/plugins/ads.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js
index f5727a1d..8b1aac8c 100644
--- a/src/js/plugins/ads.js
+++ b/src/js/plugins/ads.js
@@ -207,6 +207,11 @@ class Ads {
      * @param {Event} adsManagerLoadedEvent
      */
     onAdsManagerLoaded(event) {
+        // Load could occur after a source change (race condition)
+        if (!this.enabled) {
+            return;
+        }
+
         // Get the ads manager
         const settings = new google.ima.AdsRenderingSettings();
 
@@ -240,10 +245,6 @@ class Ads {
             });
         }
 
-        // Get skippable state
-        // TODO: Skip button
-        // this.player.debug.warn(this.manager.getAdSkippableState());
-
         // Set volume to match player
         this.manager.setVolume(this.player.volume);
 
-- 
cgit v1.2.3