Merge branch 'main' into maintenance

bbc · Mar 13, 2024 · f6116ca · f6116ca
2 parents a88785f + aed18cc
commit f6116ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gui/Player.ts b/src/gui/Player.ts
@@ -145,9 +145,8 @@ class Player extends EventEmitter {
 
         this.useExternalTransport = () => {
             // eslint-disable-next-line no-restricted-globals
-            const useExternal =
-                new URLSearchParams(parent.location.search).getAll("noUi")
-                    .length > 0 || this._controller.options?.noUi
+            const useExternal = 
+                getSetting("noUi") === "true" || this._controller.options?.noUi
             if (useExternal === undefined) return false
             return useExternal
         }

diff --git a/src/utils.ts b/src/utils.ts
@@ -87,6 +87,7 @@ export const getCurrentUrl = () => {
     return window.location.href
 }
 export const getVariableOverrides = () => {
+    if (inSMPWrapper) return [];
     const varNames = new URLSearchParams(window.location.search).getAll(
         "varName",
     )