From dba77630000444c4f9955639802a5298656fe393 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Tue, 7 Oct 2025 08:42:16 -0400
Subject: [PATCH] Ensure video modal loads before playback fallback

---
 js/app.js | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/js/app.js b/js/app.js
index 36c9e488..214684dd 100644
--- a/js/app.js
+++ b/js/app.js
@@ -8876,8 +8876,31 @@ class Application {
     const sanitizedUrl = typeof url === "string" ? url.trim() : "";
     const trimmedMagnet = typeof magnet === "string" ? magnet.trim() : "";
 
-    if (!this.modalVideo) {
-      throw new Error("Video element is not ready for playback.");
+    let modalVideoEl = this.modalVideo;
+    if (!modalVideoEl && this.videoModal) {
+      const maybeLoader = this.videoModal.load;
+      if (typeof maybeLoader === "function") {
+        try {
+          await maybeLoader.call(this.videoModal);
+        } catch (error) {
+          this.log(
+            "[playVideoWithFallback] Failed to load video modal before playback:",
+            error
+          );
+          this.showError("Could not prepare the video player. Please try again.");
+          return { source: null, error };
+        }
+        modalVideoEl = this.modalVideo;
+      }
+    }
+
+    if (!modalVideoEl) {
+      const error = new Error("Video element is not ready for playback.");
+      this.log(
+        "[playVideoWithFallback] Video element missing after modal load attempt."
+      );
+      this.showError("Video player is not ready yet. Please try again.");
+      return { source: null, error };
     }
 
     if (
@@ -8894,12 +8917,12 @@ class Application {
       }
     }
 
-    const modalVideoEl = this.modalVideo;
     const refreshedModal = this.teardownVideoElement(modalVideoEl, {
       replaceNode: true,
     });
     if (refreshedModal) {
       this.modalVideo = refreshedModal;
+      modalVideoEl = this.modalVideo;
     }
 
     const session = this.playbackService.createSession({