From a3dd82ebb47d435daf43eeff021d59705165fb07 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 22 Nov 2023 14:25:49 +0300
Subject: tabSRMM: hot keys for extended formatting should be processed not for
 group chats only

---
 plugins/TabSRMM/src/generic_msghandlers.cpp | 2 +-
 plugins/TabSRMM/src/msgdialog.cpp           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 1549d03e63..25a5b1cbc4 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -216,7 +216,7 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 			}
 			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 		}
-		break;
+		return FALSE;
 
 	case IDCANCEL:
 		ShowWindow(m_pContainer->m_hwnd, SW_MINIMIZE);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 990bb3f80d..9326fa50bb 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1643,6 +1643,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 		else if (bStrikeout == BST_CHECKED)
 			CheckDlgButton(m_hwnd, IDC_FONTSTRIKEOUT, BST_UNCHECKED);
 	}
+	
 	switch (msg) {
 	case WM_LBUTTONDOWN:
 		{
@@ -1798,12 +1799,12 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 				}
 				return 0;
 			}
-
-			if (wParam != VK_ESCAPE)
-				if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
-					return 0;
 		}
 
+		if (wParam != VK_ESCAPE)
+			if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
+				return 0;
+
 		if (wParam != VK_RIGHT && wParam != VK_LEFT) {
 			replaceStrW(m_wszSearchQuery, nullptr);
 			replaceStrW(m_wszSearchResult, nullptr);
-- 
cgit v1.2.3