From b8dade3719af1ef987b98fa9d52f0ec78c4f6051 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 15 Mar 2021 15:34:25 +0300 Subject: =?UTF-8?q?fixes=20#2768=20(TabSRMM:=20=D0=B2=20=D1=80=D0=B5=D0=B6?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=20=D1=87=D0=B0=D1=82=D0=B0=20Never=20mute=20?= =?UTF-8?q?=D1=83=20=D1=85=D0=B0=D0=B9=D0=BB=D0=B0=D0=B9=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D1=83=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B7=D0=B2=D1=83=D0=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/TabSRMM/src/chat_tools.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/TabSRMM') 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) { -- cgit v1.2.3