fix(preload): Only start preload if manager exists (#6222)

Also fixes how demo cards handle src= preloads.
shaka-project · Feb 6, 2024 · 36b7367 · 36b7367
1 parent 33a8c57
commit 36b7367
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/demo/asset_card.js b/demo/asset_card.js
@@ -272,8 +272,12 @@ shakaDemo.AssetCard = class {
         try {
           await shakaDemoMain.preloadAsset(this.asset_);
           this.remakeButtons();
-          await this.asset_.preloadManager.waitForFinish();
-          this.asset_.preloaded = true;
+          if (this.asset_.preloadManager) {
+            await this.asset_.preloadManager.waitForFinish();
+            this.asset_.preloaded = true;
+          } else {
+            this.asset_.preloadFailed = true;
+          }
         } catch (error) {
           this.asset_.preloadManager = null;
           this.asset_.preloadFailed = true;

diff --git a/lib/player.js b/lib/player.js
@@ -1627,8 +1627,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.PLAYER,
           shaka.util.Error.Code.SRC_EQUALS_PRELOAD_NOT_SUPPORTED));
+    } else {
+      preloadManager.start().catch((error) => {}); // Catch errors.
     }
-    preloadManager.start().catch((error) => {}); // Catch errors.
     return preloadManager;
   }