From de061b9f00ae2fac52c2400f27588d11e0397251 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Jul 2020 18:02:48 +0300 Subject: fixes #2233 (TabSRMM: add outgoing sound for groupchats) - method #2 --- src/mir_app/src/chat_svc.cpp | 1 - src/mir_app/src/chat_tools.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index b08820dfe6..b09d4740ee 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -773,7 +773,6 @@ int LoadChatModule(void) g_chatApi.hevPreCreate = CreateHookableEvent(ME_MSG_PRECREATEEVENT); g_chatApi.hevWinPopup = CreateHookableEvent(ME_MSG_WINDOWPOPUP); - g_plugin.addSound("ChatMessage", LPGENW("Group chats"), LPGENW("Incoming message")); g_plugin.addSound("ChatHighlight", LPGENW("Group chats"), LPGENW("Message is highlighted")); g_plugin.addSound("ChatAction", LPGENW("Group chats"), LPGENW("User has performed an action")); g_plugin.addSound("ChatJoin", LPGENW("Group chats"), LPGENW("User has joined")); diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index 760dcb04fe..d3a190b80b 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -347,7 +347,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight case GC_EVENT_NOTICE: szSound = "ChatNotice"; break; case GC_EVENT_TOPIC: szSound = "ChatTopic"; break; case GC_EVENT_MESSAGE: - szSound = "ChatMessage"; + szSound = (bInactive) ? "RecvMsgInactive" : "RecvMsgActive"; if (bInactive && !(si->wState & STATE_TALK)) { si->wState |= STATE_TALK; -- cgit v1.2.3