merge of SRMM related changes into stable

2 files changed, 6 insertions, 2 deletions

diff --git a/src/mir_core/src/CCtrlBase.cpp b/src/mir_core/src/CCtrlBase.cpp
index e0532b68a7..83d7243ab6 100644
--- a/src/mir_core/src/CCtrlBase.cpp
+++ b/src/mir_core/src/CCtrlBase.cpp
@@ -96,8 +96,7 @@ void CCtrlBase::NotifyChange()
 		m_bChanged = true;
 
 	if (m_parentWnd && !m_bSilent)
-		if (m_parentWnd->IsInitialized())
-			::SendMessage(::GetParent(m_parentWnd->GetHwnd()), PSM_CHANGED, 0, 0);
+		m_parentWnd->NotifyChange();
 
 	OnChange(this);
 }
diff --git a/src/mir_core/src/CDlgBase.cpp b/src/mir_core/src/CDlgBase.cpp
index ed3de8d553..e1eee42d94 100644
--- a/src/mir_core/src/CDlgBase.cpp
+++ b/src/mir_core/src/CDlgBase.cpp
@@ -90,6 +90,11 @@ void CDlgBase::EndModal(INT_PTR nResult)
 
 void CDlgBase::NotifyChange(void)
 {
+	if (!m_initialized)
+		return;
+
+	OnChange();
+
 	if (m_hwndParent)
 		SendMessage(m_hwndParent, PSM_CHANGED, (WPARAM)m_hwnd, 0);
 }