Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-13 01:58:44 +02:00
Code Issues Projects Releases Wiki Activity

adjustments to close to tray changes

Browse Source
This commit is contained in:
Kyle Spearrin 2018-12-03 16:06:28 -05:00
parent d5308a3bf5
commit 1da72b9a97
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/electron/baseMenu.ts
View File

@ -93,7 +93,7 @@ export class BaseMenu {
}, },
{ {
label: this.i18nService.t('close'), label: this.i18nService.t('close'),
role: 'quit', role: 'close',
}, },
], ],
}; };

4
src/electron/tray.main.ts
View File

@ -66,12 +66,10 @@ export class TrayMain {
this.hideToTray(); this.hideToTray();
} }
}); });
}
if (process.platform === 'win32') {
this.windowMain.win.on('close', async (e: Event) => { this.windowMain.win.on('close', async (e: Event) => {
if (await this.storageService.get<boolean>(ElectronConstants.enableCloseToTrayKey)) { if (await this.storageService.get<boolean>(ElectronConstants.enableCloseToTrayKey)) {
if(!this.windowMain.isQuitting){ if (!this.windowMain.isQuitting) {
e.preventDefault(); e.preventDefault();
this.hideToTray(); this.hideToTray();
} }