From 100edb31af3100192e4541e9bae78add7a8f0e18 Mon Sep 17 00:00:00 2001 From: Luna Date: Wed, 13 Dec 2023 15:42:20 -0500 Subject: [PATCH] support preloadPath not being set --- packages/injector/src/index.ts | 4 ++-- packages/node-preload/src/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/injector/src/index.ts b/packages/injector/src/index.ts index 41ec9dc..0368996 100644 --- a/packages/injector/src/index.ts +++ b/packages/injector/src/index.ts @@ -17,7 +17,7 @@ import EventEmitter from "events"; const logger = new Logger("injector"); -let oldPreloadPath = ""; +let oldPreloadPath: string | undefined; let corsAllow: string[] = []; let isMoonlightDesktop = false; @@ -76,7 +76,7 @@ function patchCsp(headers: Record) { class BrowserWindow extends ElectronBrowserWindow { constructor(opts: BrowserWindowConstructorOptions) { - oldPreloadPath = opts.webPreferences!.preload!; + oldPreloadPath = opts.webPreferences!.preload; opts.webPreferences!.preload = require.resolve("./node-preload.js"); moonlightHost.events.emit("window-options", opts); diff --git a/packages/node-preload/src/index.ts b/packages/node-preload/src/index.ts index e28a147..179fef2 100644 --- a/packages/node-preload/src/index.ts +++ b/packages/node-preload/src/index.ts @@ -83,7 +83,7 @@ async function init(oldPreloadPath: string) { } // Let Discord start even if we fail - if (oldPreloadPath !== "") require(oldPreloadPath); + if (oldPreloadPath) require(oldPreloadPath); } const oldPreloadPath: string = ipcRenderer.sendSync(