summaryrefslogtreecommitdiffhomepage
path: root/app/app.js
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-09-25 16:02:43 +0200
committerErik Larkö <erik@mullvad.net>2017-09-27 07:28:50 +0200
commit7b52a3c5bbedc8071d05eb76f1365331ecb08971 (patch)
tree9a8117bf4fa4d831204438069d653fcbbc74f8b0 /app/app.js
parent131c4487c1032a85efa37390f7ca72b3e8eb8952 (diff)
downloadmullvadvpn-7b52a3c5bbedc8071d05eb76f1365331ecb08971.tar.xz
mullvadvpn-7b52a3c5bbedc8071d05eb76f1365331ecb08971.zip
Actually implement autoconnect
Diffstat (limited to 'app/app.js')
-rw-r--r--app/app.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/app.js b/app/app.js
index e2eb712b9e..fb8a93ce1a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -26,9 +26,13 @@ const backend = new Backend(store);
ipcRenderer.on('backend-info', (_event, args) => {
backend.setLocation(args.addr);
backend.sync();
- if(store.getState().settings.autoSecure) {
- backend.autologin();
- }
+ backend.autologin()
+ .then( () => {
+ if(store.getState().settings.autoSecure) {
+ log.info('Autoconnecting...');
+ backend.connect();
+ }
+ });
});
ipcRenderer.on('disconnect', () => {
log.info('Been told by the node process to disconnect');