From 1f1adec40ac364dcc594bcfb74883552c98680d5 Mon Sep 17 00:00:00 2001
From: Abicur <abicur.x@gmail.com>
Date: Mon, 3 Dec 2018 21:57:48 +0500
Subject: [PATCH] [fix] Add additional condition for option "Show on unread" to
 show Rocket.Chat window

---
 src/scripts/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripts/events.js b/src/scripts/events.js
index 08dbdee60a..3e4bce715a 100644
--- a/src/scripts/events.js
+++ b/src/scripts/events.js
@@ -173,7 +173,8 @@ export default () => {
 	webview.on('ipc-message-unread-changed', (hostUrl, [count]) => {
 		if (typeof count === 'number' && localStorage.getItem('showWindowOnUnreadChanged') === 'true') {
 			const mainWindow = remote.getCurrentWindow();
-			if (!mainWindow.isFocused()) {
+			const isNeededToShow = !mainWindow.isFocused() || (mainWindow.isFocused() && !mainWindow.isVisible());
+			if (isNeededToShow) {
 				mainWindow.once('focus', () => mainWindow.flashFrame(false));
 				mainWindow.showInactive();
 				mainWindow.flashFrame(true);