Merge branch 'disconnect-on-exit'

2 files changed, 8 insertions, 0 deletions

diff --git a/app/app.js b/app/app.js
index 5ff241089f..e2eb712b9e 100644
--- a/app/app.js
+++ b/app/app.js
@@ -30,6 +30,10 @@ ipcRenderer.on('backend-info', (_event, args) => {
     backend.autologin();
   }
 });
+ipcRenderer.on('disconnect', () => {
+  log.info('Been told by the node process to disconnect');
+  backend.disconnect();
+});
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/app/main.js b/app/main.js
index 3df1961886..99ec3d95fa 100644
--- a/app/main.js
+++ b/app/main.js
@@ -70,6 +70,10 @@ const appDelegate = {
     });
 
     window.loadURL('file://' + path.join(__dirname, 'index.html'));
+    window.on('close', () => {
+      log.debug('The browser window is closing, disconnecting the tunnel...');
+      window.webContents.send('disconnect');
+    });
 
     // create tray icon on macOS
     if(isMacOS) {