summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-06-08 16:51:41 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-06-08 16:51:41 +0300
commit5f3314064646dec92f169b056cff6d96745022bb (patch)
tree00c45fb40662f37cb9ce8d214354aa2b76cac1b3 /src/core/stdmsg
parent123fd0d76251f073360e790eee3c8335cd8fdb31 (diff)
StdMsg: flashing of containers divided from flashing of tabs
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp8
-rw-r--r--src/core/stdmsg/src/msgs.cpp3
2 files changed, 3 insertions, 8 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 5ad478afe8..3b402181b5 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1192,13 +1192,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
break;
case WM_TIMER:
- if (wParam == TIMERID_FLASHWND) {
- if (m_nFlash > 2 * g_dat.nFlashMax) {
- StopFlash();
- return 0;
- }
- }
- else if (wParam == TIMERID_TYPE) {
+ if (wParam == TIMERID_TYPE) {
ShowTime(false);
if (m_nTypeMode == PROTOTYPE_SELFTYPING_ON && GetTickCount() - m_nLastTyping > TIMEOUT_TYPEOFF)
NotifyTyping(PROTOTYPE_SELFTYPING_OFF);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index fff89593d1..440ebc7549 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -53,7 +53,8 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_TIMER:
if (wParam == TIMERID_FLASHWND) {
m_pOwner->FixTabIcons(this);
- FlashWindow(m_pOwner->GetHwnd(), TRUE);
+ if (m_nFlash < 2 * g_dat.nFlashMax)
+ FlashWindow(m_pOwner->GetHwnd(), TRUE);
m_nFlash++;
}
break;