diff options
| author | George Hazan <ghazan@miranda.im> | 2018-06-27 22:46:16 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-06-27 22:46:22 +0300 |
| commit | 56625de314701a93f80bfadc2b4ed6fe4ce4727a (patch) | |
| tree | 566e04ff51fb54574f6700b7957257babc1025e8 | |
| parent | 3634b36ee285468f6514a3143bc99d78a3e8f51f (diff) | |
fixes #1440 (StdMsg: contact window continues flashing after activating it)
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/tabs.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 440ebc7549..ea33f6e3d7 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -53,7 +53,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER:
if (wParam == TIMERID_FLASHWND) {
m_pOwner->FixTabIcons(this);
- if (m_nFlash < 2 * g_dat.nFlashMax)
+ if (!g_dat.nFlashMax || m_nFlash < 2 * g_dat.nFlashMax)
FlashWindow(m_pOwner->GetHwnd(), TRUE);
m_nFlash++;
}
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp index 92b8ed0e46..5a0537b45d 100644 --- a/src/core/stdmsg/src/tabs.cpp +++ b/src/core/stdmsg/src/tabs.cpp @@ -556,9 +556,12 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) == WA_INACTIVE) break; - idx = TabCtrl_GetCurSel(m_tab.GetHwnd()); - if (idx != -1) - m_tab.ActivatePage(idx); + if (!m_pEmbed) { + idx = TabCtrl_GetCurSel(m_tab.GetHwnd()); + if (idx != -1) + m_tab.ActivatePage(idx); + } + else m_pEmbed->OnActivate(); break; case WM_NOTIFY: |