mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Prevent crash when tray icon no longer available (due to apt)

Browse source
This commit is contained in:
Scott Nonnenberg 2019-02-19 17:35:35 -08:00
parent 5165eb3bd4
commit 6bcd434585
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/tray_icon.js
View file

@ -1,5 +1,6 @@
const path = require('path'); const path = require('path');
const fs = require('fs');
const { app, Menu, Tray } = require('electron'); const { app, Menu, Tray } = require('electron');
let trayContextMenu = null; let trayContextMenu = null;
@ -78,14 +79,20 @@ function createTrayIcon(getMainWindow, messages) {
}; };
tray.updateIcon = unreadCount => { tray.updateIcon = unreadCount => {
let image;
if (unreadCount > 0) { if (unreadCount > 0) {
const filename = `${String(unreadCount >= 10 ? 10 : unreadCount)}.png`; const filename = `${String(unreadCount >= 10 ? 10 : unreadCount)}.png`;
tray.setImage( image = path.join(__dirname, '..', 'images', 'alert', iconSize, filename);
path.join(__dirname, '..', 'images', 'alert', iconSize, filename)
);
} else { } else {
tray.setImage(iconNoNewMessages); image = iconNoNewMessages;
} }
if (!fs.existsSync(image)) {
console.log('tray.updateIcon: Image for tray update does not exist!');
return;
}
tray.setImage(image);
}; };
tray.on('click', tray.showWindow); tray.on('click', tray.showWindow);