From 254c3156003792d0f99f931cf4322ffee6eb6fd4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 4 Jun 2018 22:03:02 +0300
Subject: StdMsg: fix active window calculation for non-tabbed mode

---
 src/core/stdmsg/src/msgs.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 90c1210714..fff89593d1 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -69,10 +69,11 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 bool CMsgDialog::IsActive() const
 {
-	if (!g_Settings.bTabsEnable)
-		return true;
+	bool bRes = m_pOwner->IsActive();
+	if (g_Settings.bTabsEnable && bRes)
+		bRes &= m_pOwner->m_tab.GetActivePage() == this;
 
-	return m_pOwner->m_tab.GetActivePage() == this && m_pOwner->IsActive();
+	return bRes;
 }
 
 void CMsgDialog::StartFlash()
-- 
cgit v1.2.3