From ac52ef0bad2993d31d1d8500e946ed9b7235f06b Mon Sep 17 00:00:00 2001
From: Ramiro Saenz <saenzramiro@gmail.com>
Date: Wed, 25 Apr 2018 18:56:56 -0300
Subject: [PATCH] Fixed unread tray error

Fixes #1606
Fixes #1565
Fixes #1386
Fixes #987
Fixes #921
Fixes #668
Fixes #438
---
 electron/main.js | 5 +++--
 electron/tray.js | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/electron/main.js b/electron/main.js
index 21507719..d1d1620c 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -277,7 +277,8 @@ function createMasterPasswordWindow() {
 function updateBadge(title) {
 	title = title.split(" - ")[0]; //Discard service name if present, could also contain digits
 	var messageCount = title.match(/\d+/g) ? parseInt(title.match(/\d+/g).join("")) : 0;
-
+	messageCount = isNaN(messageCount) ? 0 : messageCount;
+	
 	tray.setBadge(messageCount, config.get('systemtray_indicator'));
 
 	if (process.platform === 'win32') { // Windows
@@ -469,7 +470,7 @@ if ( config.get('proxy') ) {
 	app.on('login', (event, webContents, request, authInfo, callback) => {
 		if(!authInfo.isProxy)
 			return;
-			
+
 		event.preventDefault()
 		callback(config.get('proxyLogin'), config.get('proxyPassword'))
 	})
diff --git a/electron/tray.js b/electron/tray.js
index 45d627ab..bd079ed5 100644
--- a/electron/tray.js
+++ b/electron/tray.js
@@ -67,9 +67,9 @@ exports.setBadge = function(messageCount, showUnreadTray) {
 
 	let icon;
 	if (process.platform === 'linux') {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.png' : 'IconTray.png';
 	} else {
-		icon = messageCount && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
+		icon = messageCount > 0 && showUnreadTray ? 'IconTrayUnread.ico' : 'Icon.ico';
 	}
 
 	const iconPath = path.join(__dirname, `../resources/${icon}`);