diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 10:45:11 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 10:45:11 +0100 |
| commit | de737c54c413f96c35b4e9bc6280fc7d26e4fa83 (patch) | |
| tree | 0cf470c59b4c7c8a6327e64610f68f5facd78d6d /app/main.js | |
| parent | ae9c255b3ecdec341090c932db6cb261147a7382 (diff) | |
| parent | 1214138633bcca19a1b96622400f3fbcf4044bd9 (diff) | |
| download | mullvadvpn-de737c54c413f96c35b4e9bc6280fc7d26e4fa83.tar.xz mullvadvpn-de737c54c413f96c35b4e9bc6280fc7d26e4fa83.zip | |
Merge branch 'update-flow'
Diffstat (limited to 'app/main.js')
| -rw-r--r-- | app/main.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/main.js b/app/main.js index b685a27bf9..2b056680c9 100644 --- a/app/main.js +++ b/app/main.js @@ -36,7 +36,7 @@ const appDelegate = { _window: (null: ?BrowserWindow), _tray: (null: ?Tray), _logFileLocation: '', - connectionFilePollInterval: (null: ?number), + connectionFilePollInterval: (null: ?IntervalID), setup: () => { // Override userData path, i.e on macOS: ~/Library/Application Support/MullvadVPN @@ -420,6 +420,7 @@ const appDelegate = { // setup NSEvent monitor to fix inconsistent window.blur // see https://github.com/electron/electron/issues/8689 + // $FlowFixMe: this module is only available on macOS const { NSEventMonitor, NSEventMask } = require('nseventmonitor'); const trayIconManager = new TrayIconManager(tray, 'unsecured'); const macEventMonitor = new NSEventMonitor(); |