diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/main/user-interface.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/user-interface.ts b/desktop/packages/mullvad-vpn/src/main/user-interface.ts index a079246373..241135f707 100644 --- a/desktop/packages/mullvad-vpn/src/main/user-interface.ts +++ b/desktop/packages/mullvad-vpn/src/main/user-interface.ts @@ -146,9 +146,12 @@ export default class UserInterface implements WindowControllerDelegate { this.installWindowCloseHandler(); this.installTrayClickHandlers(); - const filePath = path.resolve(path.join(__dirname, '../renderer/index.html')); try { - await window.loadFile(filePath); + if (process.env.NODE_ENV === 'development' && process.env.VITE_DEV_SERVER_URL) { + await window.loadURL(process.env.VITE_DEV_SERVER_URL); + } else { + await window.loadFile(path.join(__dirname, 'index.html')); + } } catch (e) { const error = e as Error; log.error(`Failed to load index file: ${error.message}`); @@ -247,7 +250,7 @@ export default class UserInterface implements WindowControllerDelegate { show: false, frame: unpinnedWindow, webPreferences: { - preload: path.join(__dirname, '../renderer/preloadBundle.js'), + preload: path.join(__dirname, 'preload.js'), nodeIntegration: false, nodeIntegrationInWorker: false, nodeIntegrationInSubFrames: false, |