From 8e196045345d5fb5f4dce27a279828f533450311 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Thu, 7 Sep 2023 14:19:16 -0400
Subject: [PATCH] Maintenance: Another couple small fixes for building a
 standalone extension.

---
 src/addons.js            | 11 +++++++++--
 src/modules/metadata.jsx | 11 ++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/addons.js b/src/addons.js
index cd22f3c3..09fc1600 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -161,9 +161,16 @@ export default class AddonManager extends Module {
 				: null
 		]);
 
-		if ( Array.isArray(cdn_data) )
-			for(const addon of cdn_data )
+		if ( Array.isArray(cdn_data) ) {
+			// We need to handle relative URLs for addon logos.
+			const base_path = `${SERVER_OR_EXT}/addons/`;
+
+			for(const addon of cdn_data ) {
+				if ( addon.icon )
+				addon.icon = (new URL(addon.icon, base_path)).toString();
 				this.addAddon(addon, false);
+			}
+		}
 
 		if ( Array.isArray(local_data) ) {
 			this.has_dev = true;
diff --git a/src/modules/metadata.jsx b/src/modules/metadata.jsx
index 37ef8473..f51cfc65 100644
--- a/src/modules/metadata.jsx
+++ b/src/modules/metadata.jsx
@@ -362,10 +362,12 @@ export default class Metadata extends Module {
 				}
 
 				// Get the video element.
-				const video = player && maybe_call(player.getHTMLVideoElement, player);
-				stats.avOffset = 0;
-				if ( video?._ffz_context )
-					stats.avOffset = (video._ffz_context_offset ?? 0) + video._ffz_context.currentTime - video.currentTime;
+				if ( stats ) {
+					const video = player && maybe_call(player.getHTMLVideoElement, player);
+					stats.avOffset = 0;
+					if ( video?._ffz_context )
+						stats.avOffset = (video._ffz_context_offset ?? 0) + video._ffz_context.currentTime - video.currentTime;
+				}
 
 				let tampered = false;
 				try {
@@ -376,7 +378,6 @@ export default class Metadata extends Module {
 					}
 				} catch(err) { /* no op */ }
 
-
 				if ( ! stats || stats.hlsLatencyBroadcaster < -100 )
 					return {stats};