summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-06-04 22:03:02 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-06-04 22:03:02 +0300
commit254c3156003792d0f99f931cf4322ffee6eb6fd4 (patch)
tree7bff0b0e66fc34b55f81fe615d363f96fcef3420 /src/core/stdmsg
parent6cb191efaddde067c9f07f40090ee0f2f017b470 (diff)
StdMsg: fix active window calculation for non-tabbed mode
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/msgs.cpp7
1 files changed, 4 insertions, 3 deletions
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()