CSrmmBaseDialog::RefreshButtonStatus() is called now from the base class directly

2 files changed, 11 insertions, 9 deletions

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index c82cdcb866..f5e3c146c3 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1209,14 +1209,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		else m_message.SendMsg(EM_PASTESPECIAL, CF_TEXT, 0);

 		return 0;

 

-	case WM_KEYUP:

-	case WM_LBUTTONUP:

-	case WM_RBUTTONUP:

-	case WM_MBUTTONUP:

-		if (isChat())

-			RefreshButtonStatus();

-		break;

-

 	case WM_KEYDOWN:

 		bool isShift = (GetKeyState(VK_SHIFT) & 0x8000) != 0;

 		bool isCtrl = (GetKeyState(VK_CONTROL) & 0x8000) != 0;

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index cc5e0d3a53..8fa4a7864d 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -359,6 +359,13 @@ LRESULT CSrmmBaseDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_GETDLGCODE:
 		return res & ~DLGC_HASSETSEL;
 
+	case WM_KEYUP:
+	case WM_LBUTTONUP:
+	case WM_RBUTTONUP:
+	case WM_MBUTTONUP:
+		RefreshButtonStatus();
+		break;
+
 	case WM_KEYDOWN:
 	case WM_SYSKEYDOWN:
 		if (!(GetKeyState(VK_RMENU) & 0x8000)) {
@@ -959,8 +966,11 @@ bool CSrmmBaseDialog::ProcessHotkeys(int key, bool isShift, bool isCtrl, bool is
 	return false;
 }
 
-void CSrmmBaseDialog::RefreshButtonStatus(void)
+void CSrmmBaseDialog::RefreshButtonStatus()
 {
+	if (m_si == nullptr)
+		return;
+
 	CHARFORMAT2 cf;
 	cf.cbSize = sizeof(CHARFORMAT2);
 	cf.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_BACKCOLOR | CFM_COLOR;