diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-07-27 08:14:23 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-27 08:14:23 +0200 |
| commit | c6c5a61ae2f590fdf74140a770073ee7f0ad5153 (patch) | |
| tree | 0a1abced4fbbf1f565f53fdacb1e12f9a208c864 | |
| parent | 6e275325323581b4d5fed7a483927c3166e9ca90 (diff) | |
| parent | cc56d59ff2a37c001d256867d00d8f036190500d (diff) | |
| download | mullvadvpn-c6c5a61ae2f590fdf74140a770073ee7f0ad5153.tar.xz mullvadvpn-c6c5a61ae2f590fdf74140a770073ee7f0ad5153.zip | |
Merge branch 'browser-window-reload'
| -rw-r--r-- | app/main.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/main.js b/app/main.js index ae7553ce45..fd9c10b7f1 100644 --- a/app/main.js +++ b/app/main.js @@ -54,7 +54,10 @@ const appDelegate = { onReady: async () => { const window = appDelegate._window = appDelegate._createWindow(); - ipcMain.on('on-browser-window-ready', () => browserWindowReady = true); + ipcMain.on('on-browser-window-ready', () => { + browserWindowReady = true; + appDelegate._pollForConnectionInfoFile(); + }); window.loadURL('file://' + path.join(__dirname, 'index.html')); @@ -95,10 +98,6 @@ const appDelegate = { .then( p => { appDelegate._setupBackendProcessListeners(p); return p; - }) - .then( p => { - appDelegate._pollForConnectionInfoFile(); - return p; }); }, _rpcAddressFileExists: () => { |
