support preloadPath not being set

moonlight-mod · Dec 13, 2023 · 100edb3 · 100edb3
1 parent 79075b2
commit 100edb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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<string, string[]>) {
 
 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
@@ -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(