From b8c8df44a68fe62575e46278ba10da3f91c60517 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 27 Feb 2021 17:12:48 +0300
Subject: fixes #2753 (by default only checkboxes should be notified about
 OnChange before OnInitDialog)

---
 src/core/stdaway/src/sendmsg.cpp  | 3 ---
 src/core/stdmsg/src/msgdialog.cpp | 6 ------
 src/mir_core/src/CCtrlCheck.cpp   | 4 +++-
 src/mir_core/src/CDlgBase.cpp     | 3 ++-
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index c5ba002a3d..0f3c6032de 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -250,9 +250,6 @@ public:
 
 	void onChange_Msg(CCtrlEdit *)
 	{
-		if (!m_bInitialized)
-			return;
-
 		if (m_countdown >= 0) {
 			m_timer.Stop();
 			m_btnOk.SetText(TranslateT("OK"));
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index db94642259..74433f6cde 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1371,9 +1371,6 @@ void CMsgDialog::OnOptionsApplied(bool bUpdateAvatar)
 
 void CMsgDialog::onSplitterX(CSplitter *pSplitter)
 {
-	if (!m_bInitialized)
-		return;
-
 	RECT rc;
 	GetClientRect(m_hwnd, &rc);
 
@@ -1387,9 +1384,6 @@ void CMsgDialog::onSplitterX(CSplitter *pSplitter)
 
 void CMsgDialog::onSplitterY(CSplitter *pSplitter)
 {
-	if (!m_bInitialized)
-		return;
-
 	RECT rc;
 	GetClientRect(m_hwnd, &rc);
 
diff --git a/src/mir_core/src/CCtrlCheck.cpp b/src/mir_core/src/CCtrlCheck.cpp
index a20a1a9275..210c6a1d03 100644
--- a/src/mir_core/src/CCtrlCheck.cpp
+++ b/src/mir_core/src/CCtrlCheck.cpp
@@ -27,7 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 CCtrlCheck::CCtrlCheck(CDlgBase *dlg, int ctrlId)
 	: CCtrlData(dlg, ctrlId)
-{}
+{
+	m_bNotifiable = true;
+}
 
 BOOL CCtrlCheck::OnCommand(HWND, WORD, WORD)
 {
diff --git a/src/mir_core/src/CDlgBase.cpp b/src/mir_core/src/CDlgBase.cpp
index dcfe15b292..95449c56a0 100644
--- a/src/mir_core/src/CDlgBase.cpp
+++ b/src/mir_core/src/CDlgBase.cpp
@@ -219,7 +219,8 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			return FALSE;
 
 		for (auto &it : m_controls)
-			it->OnChange(it);
+			if (it->m_bNotifiable)
+				it->OnChange(it);
 
 		m_bInitialized = true;
 		return TRUE;
-- 
cgit v1.2.3