summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src/chat_tools.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-03-15 15:34:25 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-03-15 15:34:25 +0300
commitb8dade3719af1ef987b98fa9d52f0ec78c4f6051 (patch)
treecc01e02b59136f0900879ff328f5339800f7c59d /plugins/TabSRMM/src/chat_tools.cpp
parentd49094d01430c0a0f4b8aa39a3e4cf619be7d9f2 (diff)
fixes #2768 (TabSRMM: в режиме чата Never mute у хайлайтов отсутствует звук)
Diffstat (limited to 'plugins/TabSRMM/src/chat_tools.cpp')
-rw-r--r--plugins/TabSRMM/src/chat_tools.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index bcb5d483a1..b3d2044f9c 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -284,7 +284,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
}
if (iMuteMode != CHATMODE_MUTE) {
- auto sound = si->getSoundName(iEvent);
+ auto sound = si->getSoundName(gce->iType);
if (dat) {
bInactive = dat->m_pContainer->m_hwnd != GetForegroundWindow();
bActiveTab = (dat->m_pContainer->m_hwndActive == dat->GetHwnd());
@@ -298,10 +298,10 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
// dialog event processing
if (dat) {
HICON hIconHighlight = g_chatApi.getIcon(GC_EVENT_HIGHLIGHT), hIconMessage = g_chatApi.getIcon(GC_EVENT_MESSAGE);
- HICON hNotifyIcon = (bManyFix && !bInactive) ? 0 : g_chatApi.getIcon(iEvent);
+ HICON hNotifyIcon = (bManyFix && !bInactive) ? 0 : g_chatApi.getIcon(gce->iType);
BOOL bForcedIcon = (hNotifyIcon == hIconHighlight || hNotifyIcon == hIconMessage);
- if ((iEvent & si->iLogTrayFlags) || bForcedIcon) {
+ if ((gce->iType & si->iLogTrayFlags) || bForcedIcon) {
if (!bActiveTab) {
if (hNotifyIcon == hIconHighlight)
dat->m_iFlashIcon = hNotifyIcon;
@@ -337,7 +337,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
if (!dat->m_pContainer->m_flags.m_bNoFlash)
dat->m_pContainer->FlashContainer(1, 0);
- if (hNotifyIcon && bInactive && ((iEvent & si->iLogTrayFlags) || bForcedIcon)) {
+ if (hNotifyIcon && bInactive && ((gce->iType & si->iLogTrayFlags) || bForcedIcon)) {
if (bMustFlash)
dat->m_hTabIcon = hNotifyIcon;
else if (dat->m_iFlashIcon) {