Fix: IsmaelMartinez#602

app/index.js

@@ -149,5 +149,5 @@ function handleCertificateError() {
 		callback: arguments[5],
 		config: config
 	};
-	certificateModule.onAppCertificateError(arg,logger);
+	certificateModule.onAppCertificateError(arg, logger);
 }

app/mainAppWindow/index.js

@@ -1,5 +1,5 @@
 require('@electron/remote/main').initialize();
-const { shell, BrowserWindow, ipcMain } = require('electron');
+const { shell, BrowserWindow, ipcMain, app } = require('electron');
 const windowStateKeeper = require('electron-window-state');
 const path = require('path');
 const login = require('../login');
@@ -61,6 +61,7 @@ exports.onAppReady = function onAppReady(mainConfig) {
 	window.on('closed', () => {
 		logger.debug('window closed');
 		window = null;
+		app.quit();
 	});
 
 	const url = processArgs(process.argv);

app/menus/index.js

@@ -18,7 +18,8 @@ class Menus {
 	}
 
 	quit() {
-		app.quit();
+		this.allowQuit = true;
+		this.window.close();
 	}
 
 	open() {
@@ -57,7 +58,7 @@ class Menus {
 
 		this.window.webContents.on('context-menu', assignContextMenuHandler(this.window));
 
-		new Tray(this.window, appMenu.submenu, this.iconPath);
+		this.tray = new Tray(this.window, appMenu.submenu, this.iconPath);
 	}
 
 	onBeforeQuit() {
@@ -71,6 +72,7 @@ class Menus {
 			event.preventDefault();
 			this.hide();
 		} else {
+			this.tray.close();
 			this.window.webContents.session.flushStorageData();
 		}
 	}

app/menus/tray.js

@@ -14,7 +14,7 @@ class ApplicationTray {
 		this.tray.on('click', () => this.showAndFocusWindow());
 		this.tray.setContextMenu(Menu.buildFromTemplate(this.appMenu));
 
-		ipcMain.on('tray-update', (event, {icon, flash}) => this.updateTrayImage(icon, flash));
+		ipcMain.on('tray-update', (event, { icon, flash }) => this.updateTrayImage(icon, flash));
 	}
 
 	showAndFocusWindow() {
@@ -28,5 +28,9 @@ class ApplicationTray {
 		this.tray.setImage(image);
 		this.window.flashFrame(flash);
 	}
+
+	close() {
+		this.tray.destroy();
+	}
 }
 exports = module.exports = ApplicationTray;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",
@@ -42,13 +42,13 @@
     "electron-store": "8.1.0",
     "electron-window-state": "5.0.3",
     "lucid-log": "^0.0.3",
-    "node-sound": "^0.0.4",
+    "node-sound": "^0.0.5",
     "yargs": "17.5.1"
   },
   "devDependencies": {
-    "electron": "^20.1.4",
+    "electron": "^20.2.0",
     "electron-builder": "23.3.3",
-    "eslint": "8.23.1",
+    "eslint": "8.24.0",
     "yarn": "1.22.19"
   },
   "build": {

yarn.lock

@@ -64,10 +64,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@humanwhocodes/config-array@^0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
-  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
+"@humanwhocodes/config-array@^0.10.5":
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.5.tgz#bb679745224745fff1e9a41961c1d45a49f81c04"
+  integrity sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -176,14 +176,14 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node@*":
-  version "18.7.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154"
-  integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==
+  version "18.7.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.21.tgz#63ee6688070e456325b6748dc492a7b948593871"
+  integrity sha512-rLFzK5bhM0YPyCoTC8bolBjMk7bwnZ8qeZUBslBfjZQou2ssJdWslx9CZ8DGM+Dx7QXQiiTVZ/6QO6kwtHkZCA==
 
 "@types/node@^16.11.26":
-  version "16.11.59"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6"
-  integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==
+  version "16.11.60"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.60.tgz#a1fbca80c18dd80c8783557304cdb7d55ac3aff5"
+  integrity sha512-kYIYa1D1L+HDv5M5RXQeEu1o0FKA6yedZIoyugm/MBPROkLpX4L7HRxMrPVyo8bnvjpW/wDlqFNGzXNMb7AdRw==
 
 "@types/plist@^3.0.1":
   version "3.0.2"
@@ -204,9 +204,9 @@
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^17.0.1":
-  version "17.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526"
-  integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==
+  version "17.0.13"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
+  integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -939,10 +939,10 @@ [email protected]:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@^20.1.4:
-  version "20.1.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.4.tgz#d25b549f14376f99a0a239e27d67ef8515b4a5a0"
-  integrity sha512-7ov5kgSQi2JewV5SrVfjGasUvyScjuJrrDCW0rYxtP2SMe3JjoP4rsOOnh3ps2P/Nrdlbv+0ygiK0zp4ARCZ+A==
+electron@^20.2.0:
+  version "20.2.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-20.2.0.tgz#f37074c8fe16ae88c322febf71f3a130013ca534"
+  integrity sha512-qw92PfXaC+fGoqJfQ2U5tVF8ux5HyVwgt1AxAtx6uz+dYcgtPBvfBN1jb+uzZVR+QVd+wCJ8Sqt6TD1ctwTauw==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"
@@ -1015,13 +1015,13 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.23.1:
-  version "8.23.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc"
-  integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==
+eslint@8.24.0:
+  version "8.24.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.24.0.tgz#489516c927a5da11b3979dbfb2679394523383c8"
+  integrity sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==
   dependencies:
     "@eslint/eslintrc" "^1.3.2"
-    "@humanwhocodes/config-array" "^0.10.4"
+    "@humanwhocodes/config-array" "^0.10.5"
     "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
     "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
@@ -1934,10 +1934,10 @@ node-addon-api@^1.6.3:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-sound@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/node-sound/-/node-sound-0.0.4.tgz#043cc2f497b60cc66e728b8aebdc8b5c08087906"
-  integrity sha512-//vMJe0j7Ws1I2hENBmDUcDqkwQY1F/BG5Mk9WmdOFb3lMHhR/nCmsS7yCaHRbLg1v+P3fgrBUfvx11spZtOsw==
+node-sound@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/node-sound/-/node-sound-0.0.5.tgz#fd710b9a204646695babcac7da23bbd3b4cd766d"
+  integrity sha512-jfBNZEVp2Hbh4CaEUJa46ePXEos3OA/FUycpdBQDnzcYZhH6fhlKgXp5UQ0ZIYAVEdxEMsIco6C2BE0uckTnFg==
 
 normalize-url@^4.1.0:
   version "4.5.1"