From fcb6e9d2f7ea4c76236b85389625c5f6fe821c33 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 11 Oct 2020 17:37:09 +0300 Subject: fixes #2590 (TabSRMM: Cannot setup event filter) --- src/mir_app/src/chat_manager.cpp | 3 ++- src/mir_app/src/srmm_base.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp index 7456567452..1656ebfc28 100644 --- a/src/mir_app/src/chat_manager.cpp +++ b/src/mir_app/src/chat_manager.cpp @@ -990,7 +990,8 @@ void Chat_RemoveContact(MCONTACT hContact) ///////////////////////////////////////////////////////////////////////////////////////// CHAT_MANAGER::CHAT_MANAGER() : - arSessions(g_arSessions) + arSessions(g_arSessions), + bRightClickFilter(CHAT_MODULE, "RightClickFilter", false) { pLogIconBmpBits = ::pLogIconBmpBits; diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 9813fc9f20..e672cf5776 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -117,7 +117,7 @@ static LRESULT CALLBACK Srmm_ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wPar { switch (msg) { case WM_RBUTTONUP: - if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) != 0) { + if (g_chatApi.bRightClickFilter) { CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA); if (pDlg == nullptr) break; @@ -616,7 +616,7 @@ void CSrmmBaseDialog::onClick_Color(CCtrlButton *pButton) cf.dwMask = CFM_COLOR; if (IsDlgButtonChecked(m_hwnd, pButton->GetCtrlId())) { - if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) == 0) { + if (!g_chatApi.bRightClickFilter) { ShowColorChooser(pButton->GetCtrlId()); return; } @@ -639,7 +639,7 @@ void CSrmmBaseDialog::onClick_BkColor(CCtrlButton *pButton) cf.dwMask = CFM_BACKCOLOR; if (IsDlgButtonChecked(m_hwnd, pButton->GetCtrlId())) { - if (!db_get_b(0, CHAT_MODULE, "RightClickFilter", 0)) { + if (!g_chatApi.bRightClickFilter) { ShowColorChooser(pButton->GetCtrlId()); return; } -- cgit v1.2.3