diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-09-21 08:15:45 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-09-24 08:39:30 -0300 |
| commit | 9ada7902470c2a6d2217766b06e4bcb538e948c3 (patch) | |
| tree | 185cc1f730e9864c5ada41c36682681241c3ec38 | |
| parent | 6d05c951c73f0166def069238d1324867ceb0058 (diff) | |
| download | mullvadvpn-9ada7902470c2a6d2217766b06e4bcb538e948c3.tar.xz mullvadvpn-9ada7902470c2a6d2217766b06e4bcb538e948c3.zip | |
Always update account expiry when window is shown
| -rw-r--r-- | gui/packages/desktop/src/main/index.js | 7 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/app.js | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gui/packages/desktop/src/main/index.js b/gui/packages/desktop/src/main/index.js index c9067a0146..46806ae767 100644 --- a/gui/packages/desktop/src/main/index.js +++ b/gui/packages/desktop/src/main/index.js @@ -158,6 +158,7 @@ const ApplicationMain = { const windowController = new WindowController(window, tray); const trayIconController = new TrayIconController(tray, 'unsecured'); + this._registerWindowListener(windowController); this._registerIpcListeners(); this._setAppMenu(); this._addContextMenu(window); @@ -189,6 +190,12 @@ const ApplicationMain = { window.loadFile(path.resolve(path.join(__dirname, '../renderer/index.html'))); }, + _registerWindowListener(windowController: WindowController) { + const window = windowController.window; + + window.on('show', () => window.webContents.send('window-shown')); + }, + _registerIpcListeners() { ipcMain.on('show-window', () => { const windowController = this._windowController; diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js index fe38ab21d6..c65906d010 100644 --- a/gui/packages/desktop/src/renderer/app.js +++ b/gui/packages/desktop/src/renderer/app.js @@ -118,6 +118,8 @@ export default class AppRenderer { } }); + ipcRenderer.on('window-shown', () => this.updateAccountExpiry()); + // disable pinch to zoom webFrame.setVisualZoomLevelLimits(1, 1); } |
