Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-04 07:10:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(tray): Prevent system tray from being initialized more than once

Browse source 
- Makes sure the tray is deactivated before activating
This commit is contained in:
Juan Tejada 2015-11-21 19:05:29 -08:00
parent 0258b99870
commit cc536c1268
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
internal_packages/system-tray/lib/main.es6
View file

@ -2,7 +2,7 @@ import SystemTray from './system-tray';
const platform = process.platform;
let systemTray;
let unsubConfig;
let unsubConfig = ()=>{};
const onSystemTrayToggle = (showSystemTray)=> {
if (showSystemTray.newValue) {
systemTray = new SystemTray(platform);
@ -12,13 +12,6 @@ const onSystemTrayToggle = (showSystemTray)=> {
}
};
export function activate() {
unsubConfig = NylasEnv.config.onDidChange('core.showSystemTray', onSystemTrayToggle).dispose;
if (NylasEnv.config.get('core.showSystemTray')) {
systemTray = new SystemTray(platform);
}
}
export function deactivate() {
if (systemTray) {
systemTray.destroy();
@ -27,6 +20,14 @@ export function deactivate() {
unsubConfig();
}
export function activate() {
deactivate();
unsubConfig = NylasEnv.config.onDidChange('core.showSystemTray', onSystemTrayToggle).dispose;
if (NylasEnv.config.get('core.showSystemTray')) {
systemTray = new SystemTray(platform);
}
}
export function serialize() {
}