summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp2
-rw-r--r--src/mir_app/src/chat_manager.cpp3
-rw-r--r--src/mir_app/src/srmm_base.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 966b212cc8..a1f662deb9 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -333,7 +333,7 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
m_bFilterEnabled = !m_bFilterEnabled;
m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2, FALSE));
- if (m_bFilterEnabled && db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) == 0)
+ if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
ShowFilterMenu();
else
RedrawLog();
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;
}