there's no need to make FilterWndProc a class member anymore

10 files changed, 145 insertions, 134 deletions

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index e424cf3d41..8e2132d2c3 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -434,8 +434,12 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 

 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)

 		ShowFilterMenu();

-	else

+	else {

+		if (m_hwndFilter)

+			SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);

+

 		RedrawLog();

+	}

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -613,84 +617,6 @@ void CMsgDialog::MessageDialogResize(int w, int h)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

-{

-	int iFlags;

-	static CMsgDialog *pDlg = nullptr;

-

-	switch (uMsg) {

-	case WM_INITDIALOG:

-		pDlg = (CMsgDialog *)lParam;

-

-		iFlags = db_get_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags");

-		CheckDlgButton(hwndDlg, IDC_CHAT_1, iFlags & GC_EVENT_ACTION ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_2, iFlags & GC_EVENT_MESSAGE ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_3, iFlags & GC_EVENT_NICK ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_4, iFlags & GC_EVENT_JOIN ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_5, iFlags & GC_EVENT_PART ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_6, iFlags & GC_EVENT_TOPIC ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_7, iFlags & GC_EVENT_ADDSTATUS ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_8, iFlags & GC_EVENT_INFORMATION ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_9, iFlags & GC_EVENT_QUIT ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_10, iFlags & GC_EVENT_KICK ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHAT_11, iFlags & GC_EVENT_NOTICE ? BST_CHECKED : BST_UNCHECKED);

-		break;

-

-	case WM_CTLCOLOREDIT:

-	case WM_CTLCOLORSTATIC:

-		SetTextColor((HDC)wParam, RGB(60, 60, 150));

-		SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));

-		return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);

-

-	case WM_ACTIVATE:

-		if (LOWORD(wParam) == WA_INACTIVE) {

-			iFlags = 0;

-

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_1) == BST_CHECKED)

-				iFlags |= GC_EVENT_ACTION;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_2) == BST_CHECKED)

-				iFlags |= GC_EVENT_MESSAGE;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_3) == BST_CHECKED)

-				iFlags |= GC_EVENT_NICK;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_4) == BST_CHECKED)

-				iFlags |= GC_EVENT_JOIN;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_5) == BST_CHECKED)

-				iFlags |= GC_EVENT_PART;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_6) == BST_CHECKED)

-				iFlags |= GC_EVENT_TOPIC;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_7) == BST_CHECKED)

-				iFlags |= GC_EVENT_ADDSTATUS;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_8) == BST_CHECKED)

-				iFlags |= GC_EVENT_INFORMATION;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_9) == BST_CHECKED)

-				iFlags |= GC_EVENT_QUIT;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_10) == BST_CHECKED)

-				iFlags |= GC_EVENT_KICK;

-			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_11) == BST_CHECKED)

-				iFlags |= GC_EVENT_NOTICE;

-

-			if (iFlags & GC_EVENT_ADDSTATUS)

-				iFlags |= GC_EVENT_REMOVESTATUS;

-

-			db_set_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags", iFlags);

-			db_set_dw(pDlg->m_hContact, CHAT_MODULE, "FilterMask", 0xFFFF);

-

-			Chat_SetFilters(pDlg->getChat());

-			pDlg->RedrawLog();

-			PostMessage(hwndDlg, WM_CLOSE, 0, 0);

-		}

-		break;

-

-	case WM_CLOSE:

-		DestroyWindow(hwndDlg);

-		break;

-	}

-

-	return FALSE;

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

 LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	int result = InputAreaShortcuts(m_message.GetHwnd(), msg, wParam, lParam);

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index d98d8709ff..2074447d14 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -65,8 +65,6 @@ class CMsgDialog : public CSrmmBaseDialog
 	bool   IsTypingNotificationSupported(void);

 	void   NotifyTyping(int mode);

 

-	static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

-

 	bool   m_bIncoming = false, m_bWindowCascaded;

 

 	MEVENT m_hDbUnreadEventFirst;

@@ -168,6 +166,7 @@ public:
 	}

 

 	wchar_t *m_wszInitialText;

+	MWindow m_hwndFilter;

 

 	void Reattach(HWND hwndContainer);

 };

diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index a0ac86aa08..327733cc9f 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -450,14 +450,94 @@ void CMsgDialog::ShowAvatar()
 	RedrawWindow(GetDlgItem(m_hwnd, IDC_AVATAR), nullptr, nullptr, RDW_INVALIDATE);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	int iFlags;
+	auto *pDlg = (CMsgDialog*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+
+	switch (uMsg) {
+	case WM_INITDIALOG:
+		pDlg = (CMsgDialog *)lParam;
+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
+
+		iFlags = db_get_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags");
+		CheckDlgButton(hwndDlg, IDC_CHAT_1, iFlags & GC_EVENT_ACTION ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_2, iFlags & GC_EVENT_MESSAGE ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_3, iFlags & GC_EVENT_NICK ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_4, iFlags & GC_EVENT_JOIN ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_5, iFlags & GC_EVENT_PART ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_6, iFlags & GC_EVENT_TOPIC ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_7, iFlags & GC_EVENT_ADDSTATUS ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_8, iFlags & GC_EVENT_INFORMATION ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_9, iFlags & GC_EVENT_QUIT ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_10, iFlags & GC_EVENT_KICK ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_CHAT_11, iFlags & GC_EVENT_NOTICE ? BST_CHECKED : BST_UNCHECKED);
+		break;
+
+	case WM_CTLCOLOREDIT:
+	case WM_CTLCOLORSTATIC:
+		SetTextColor((HDC)wParam, RGB(60, 60, 150));
+		SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));
+		return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);
+
+	case WM_ACTIVATE:
+		if (LOWORD(wParam) == WA_INACTIVE) {
+			iFlags = 0;
+
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_1) == BST_CHECKED)
+				iFlags |= GC_EVENT_ACTION;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_2) == BST_CHECKED)
+				iFlags |= GC_EVENT_MESSAGE;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_3) == BST_CHECKED)
+				iFlags |= GC_EVENT_NICK;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_4) == BST_CHECKED)
+				iFlags |= GC_EVENT_JOIN;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_5) == BST_CHECKED)
+				iFlags |= GC_EVENT_PART;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_6) == BST_CHECKED)
+				iFlags |= GC_EVENT_TOPIC;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_7) == BST_CHECKED)
+				iFlags |= GC_EVENT_ADDSTATUS;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_8) == BST_CHECKED)
+				iFlags |= GC_EVENT_INFORMATION;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_9) == BST_CHECKED)
+				iFlags |= GC_EVENT_QUIT;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_10) == BST_CHECKED)
+				iFlags |= GC_EVENT_KICK;
+			if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_11) == BST_CHECKED)
+				iFlags |= GC_EVENT_NOTICE;
+
+			if (iFlags & GC_EVENT_ADDSTATUS)
+				iFlags |= GC_EVENT_REMOVESTATUS;
+
+			db_set_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags", iFlags);
+			db_set_dw(pDlg->m_hContact, CHAT_MODULE, "FilterMask", 0xFFFF);
+
+			Chat_SetFilters(pDlg->getChat());
+			pDlg->RedrawLog();
+			PostMessage(hwndDlg, WM_CLOSE, 0, 0);
+		}
+		break;
+
+	case WM_CLOSE:
+		pDlg->m_hwndFilter = nullptr;
+		DestroyWindow(hwndDlg);
+		break;
+	}
+
+	return FALSE;
+}
+
 void CMsgDialog::ShowFilterMenu()
 {
-	HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
-	TranslateDialogDefault(hwnd);
+	m_hwndFilter = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
+	TranslateDialogDefault(m_hwndFilter);
 
 	RECT rc;
 	GetWindowRect(m_btnFilter.GetHwnd(), &rc);
-	SetWindowPos(hwnd, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
+	SetWindowPos(m_hwndFilter, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
 }
 
 void CMsgDialog::ShowMessageSending()
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 587c078d9a..476d42eb5f 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -923,8 +923,10 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)

 		ShowFilterMenu();

 	else {

-		if (m_hwndFilter)

-			SendMessage(m_hwndFilter, WM_CLOSE, 1, 1);

+		if (m_hwndFilter) {

+			SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);

+			m_hwndFilter = nullptr;

+		}

 

 		RedrawLog();

 		UpdateTitle();

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 01eb7c7239..c2f2afd3e3 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -1672,7 +1672,7 @@ static UINT _eventorder[] =
 	GC_EVENT_NOTICE

 };

 

-INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	CMsgDialog *pDlg = (CMsgDialog *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 	switch (uMsg) {

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 7e50a8bf61..9e8bfd4283 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -540,7 +540,6 @@ public:
 	TContainerData *m_pContainer;		// parent container description structure

 	AVATARCACHEENTRY *m_ace, *m_ownAce;

 

-	static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

 	bool TabAutoComplete();

 

 	HWND m_hwndFilter;

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index c901b0a2ec..465fb649b2 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -32,52 +32,15 @@ void CMsgDialog::LoadSettings()
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-void CMsgDialog::ShowFilterMenu()

-{

-	HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);

-	TranslateDialogDefault(hwnd);

-

-	RECT rc;

-	GetWindowRect(m_btnFilter.GetHwnd(), &rc);

-	SetWindowPos(hwnd, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);

-}

-

-void CMsgDialog::UpdateFilterButton()

-{

-	CSuper::UpdateFilterButton();

-

-	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2));

-	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));

-}

-

-void CMsgDialog::UpdateStatusBar()

-{

-	wchar_t *ptszDispName = m_si->pMI->ptszModDispName;

-	int x = 12;

-	x += Chat_GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_pOwner->m_hwndStatus, WM_GETFONT, 0, 0), TRUE);

-	x += GetSystemMetrics(SM_CXSMICON);

-	int iStatusbarParts[2] = { x, -1 };

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);

-

-	HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);

-	DestroyIcon(hIcon);

-

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

-	SendMessage(m_pOwner->m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

-INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	int iFlags;

-	static CMsgDialog *pDlg = nullptr;

+	auto *pDlg = (CMsgDialog*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

 	switch (uMsg) {

 	case WM_INITDIALOG:

-		pDlg = (CMsgDialog*)lParam;

+		pDlg = (CMsgDialog *)lParam;

+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

 		iFlags = db_get_dw(pDlg->m_hContact, CHAT_MODULE, "FilterFlags");

 		CheckDlgButton(hwndDlg, IDC_1, iFlags & GC_EVENT_ACTION ? BST_CHECKED : BST_UNCHECKED);

@@ -139,9 +102,48 @@ INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 		break;

 

 	case WM_CLOSE:

+		pDlg->m_hwndFilter = nullptr;

 		DestroyWindow(hwndDlg);

 		break;

 	}

 

 	return FALSE;

 }

+

+void CMsgDialog::ShowFilterMenu()

+{

+	m_hwndFilter = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);

+	TranslateDialogDefault(m_hwndFilter);

+

+	RECT rc;

+	GetWindowRect(m_btnFilter.GetHwnd(), &rc);

+	SetWindowPos(m_hwndFilter, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+void CMsgDialog::UpdateFilterButton()

+{

+	CSuper::UpdateFilterButton();

+

+	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bFilterEnabled ? IDI_FILTER : IDI_FILTER2));

+	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST : IDI_NICKLIST2, FALSE));

+}

+

+void CMsgDialog::UpdateStatusBar()

+{

+	wchar_t *ptszDispName = m_si->pMI->ptszModDispName;

+	int x = 12;

+	x += Chat_GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_pOwner->m_hwndStatus, WM_GETFONT, 0, 0), TRUE);

+	x += GetSystemMetrics(SM_CXSMICON);

+	int iStatusbarParts[2] = { x, -1 };

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);

+

+	HICON hIcon = ImageList_GetIcon(Clist_GetImageList(), GetImageId(), ILD_TRANSPARENT);

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);

+	DestroyIcon(hIcon);

+

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

+	SendMessage(m_pOwner->m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));

+}

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 79de2343a0..ef9cf07067 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -273,8 +273,12 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
 

 	if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)

 		ShowFilterMenu();

-	else

+	else {

+		if (m_hwndFilter)

+			SendMessage(m_hwndFilter, WM_CLOSE, 0, 0);

+

 		RedrawLog();

+	}

 }

 

 void CMsgDialog::onClick_NickList(CCtrlButton *pButton)

diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 9e72103eac..66e580ec5f 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -43,8 +43,6 @@ class CMsgDialog : public CSrmmBaseDialog
 	void UpdateIcon(WPARAM wParam);

 	void UpdateLastMessage(void);

 

-	static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

-

 	CCtrlBase m_avatar;

 	

 	void OnFlash(CTimer *);

@@ -125,6 +123,7 @@ public:
 	bool m_bIsAutoRTL = false;

 	HBITMAP m_avatarPic = 0;

 	wchar_t *m_wszInitialText = 0;

+	MWindow m_hwndFilter;

 

 	int GetImageId() const;

 

diff --git a/src/mir_app/src/srmm_main.cpp b/src/mir_app/src/srmm_main.cpp
index c033ade4df..f990f86be3 100644
--- a/src/mir_app/src/srmm_main.cpp
+++ b/src/mir_app/src/srmm_main.cpp
@@ -184,9 +184,9 @@ static HOTKEYDESC srmmHotkeys[] = {
 	{ "srmm_bkcolor",  LPGEN("Toggle back color"),           BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'L'), 0, SRMM_HK_BKCOLOR },
 	{ "srmm_clear",    LPGEN("Clear formatting"),            BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, VK_SPACE), 0, SRMM_HK_CLEAR },
 	{ "srmm_history",  LPGEN("Open history window"),         BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'H'), 0, SRMM_HK_HISTORY},
-	{ "srmm_cmgr",     LPGEN("Channel manager"),             BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'O'), 0, SRMM_HK_CHANNELMGR },
-	{ "srmm_filter",   LPGEN("Toggle filter"),               BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'F'), 0, SRMM_HK_FILTERTOGGLE },
+	{ "srmm_filter",   LPGEN("Toggle filter"),               BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'F'), 0, SRMM_HK_FILTERTOGGLE },
 	{ "srmm_nicklist", LPGEN("Toggle nick list"),            BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'N'), 0, SRMM_HK_LISTTOGGLE },
+	{ "srmm_cmgr",     LPGEN("Channel manager"),             BB_HK_SECTION, nullptr, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'O'), 0, SRMM_HK_CHANNELMGR },
 };
 
 int LoadSrmmModule()