10 files changed, 3 insertions, 16 deletions
diff --git a/src/mir_core/src/Windows/CCtrlBase.cpp b/src/mir_core/src/Windows/CCtrlBase.cpp
index a238883dfd..0c330b9032 100644
--- a/src/mir_core/src/Windows/CCtrlBase.cpp
+++ b/src/mir_core/src/Windows/CCtrlBase.cpp
@@ -55,7 +55,6 @@ void CCtrlBase::OnDestroy()
 
 bool CCtrlBase::OnApply()
 {
-	m_bChanged = false;
 	return true;
 }
 
diff --git a/src/mir_core/src/Windows/CCtrlCheck.cpp b/src/mir_core/src/Windows/CCtrlCheck.cpp
index b34d66eaa2..feb3e550bd 100644
--- a/src/mir_core/src/Windows/CCtrlCheck.cpp
+++ b/src/mir_core/src/Windows/CCtrlCheck.cpp
@@ -39,8 +39,6 @@ BOOL CCtrlCheck::OnCommand(HWND, uint16_t, uint16_t)
 
 bool CCtrlCheck::OnApply()
 {
-	CSuper::OnApply();
-
 	if (m_hwnd && m_dbLink)
 		SaveInt(GetState());
 	return true;
diff --git a/src/mir_core/src/Windows/CCtrlColor.cpp b/src/mir_core/src/Windows/CCtrlColor.cpp
index c6af4191f5..404311f860 100644
--- a/src/mir_core/src/Windows/CCtrlColor.cpp
+++ b/src/mir_core/src/Windows/CCtrlColor.cpp
@@ -37,8 +37,6 @@ BOOL CCtrlColor::OnCommand(HWND, uint16_t, uint16_t)
 
 bool CCtrlColor::OnApply()
 {
-	CSuper::OnApply();
-
 	if (m_hwnd && m_dbLink)
 		SaveInt(GetColor());
 	return true;
diff --git a/src/mir_core/src/Windows/CCtrlCombo.cpp b/src/mir_core/src/Windows/CCtrlCombo.cpp
index cb2f003e66..a25614de49 100644
--- a/src/mir_core/src/Windows/CCtrlCombo.cpp
+++ b/src/mir_core/src/Windows/CCtrlCombo.cpp
@@ -54,8 +54,6 @@ void CCtrlCombo::OnInit()
 
 bool CCtrlCombo::OnApply()
 {
-	CSuper::OnApply();
-
 	if (GetDataType() == DBVT_WCHAR) {
 		int len = GetWindowTextLength(m_hwnd) + 1;
 		wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len);
diff --git a/src/mir_core/src/Windows/CCtrlEdit.cpp b/src/mir_core/src/Windows/CCtrlEdit.cpp
index 57368ca44e..f42db57188 100644
--- a/src/mir_core/src/Windows/CCtrlEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlEdit.cpp
@@ -38,8 +38,6 @@ BOOL CCtrlEdit::OnCommand(HWND, uint16_t, uint16_t idCode)
 
 bool CCtrlEdit::OnApply()
 {
-	CSuper::OnApply();
-
 	if (GetDataType() == DBVT_WCHAR) {
 		int len = GetWindowTextLength(m_hwnd) + 1;
 		wchar_t *buf = (wchar_t *)_alloca(sizeof(wchar_t) * len);
diff --git a/src/mir_core/src/Windows/CCtrlPages.cpp b/src/mir_core/src/Windows/CCtrlPages.cpp
index e530fe211b..890254fb3f 100644
--- a/src/mir_core/src/Windows/CCtrlPages.cpp
+++ b/src/mir_core/src/Windows/CCtrlPages.cpp
@@ -395,7 +395,6 @@ bool CCtrlPages::OnApply()
 		}
 	}
 	
-	CSuper::OnApply();
 	return true;
 }
 
diff --git a/src/mir_core/src/Windows/CCtrlSlider.cpp b/src/mir_core/src/Windows/CCtrlSlider.cpp
index b888b7d465..e81b0cab1f 100644
--- a/src/mir_core/src/Windows/CCtrlSlider.cpp
+++ b/src/mir_core/src/Windows/CCtrlSlider.cpp
@@ -44,8 +44,6 @@ BOOL CCtrlSlider::OnCommand(HWND, uint16_t, uint16_t idCode)
 
 bool CCtrlSlider::OnApply()
 {
-	CSuper::OnApply();
-
 	if (m_hwnd && m_dbLink)
 		SaveInt(GetPosition());
 	return true;
diff --git a/src/mir_core/src/Windows/CCtrlSpin.cpp b/src/mir_core/src/Windows/CCtrlSpin.cpp
index c3f6bd54af..38c3616a88 100644
--- a/src/mir_core/src/Windows/CCtrlSpin.cpp
+++ b/src/mir_core/src/Windows/CCtrlSpin.cpp
@@ -48,8 +48,6 @@ BOOL CCtrlSpin::OnNotify(int, NMHDR *pnmh)
 
 bool CCtrlSpin::OnApply()
 {
-	CSuper::OnApply();
-
 	m_wCurr = SendMsg(UDM_GETPOS, 0, 0);
 	if (m_hwnd && m_dbLink)
 		SaveInt(m_wCurr);
diff --git a/src/mir_core/src/Windows/CCtrlTreeOpts.cpp b/src/mir_core/src/Windows/CCtrlTreeOpts.cpp
index fed60340f5..686a4a2734 100644
--- a/src/mir_core/src/Windows/CCtrlTreeOpts.cpp
+++ b/src/mir_core/src/Windows/CCtrlTreeOpts.cpp
@@ -163,8 +163,6 @@ void CCtrlTreeOpts::OnDestroy()
 
 bool CCtrlTreeOpts::OnApply()
 {
-	CSuper::OnApply();
-
 	for (auto &it : m_options) {
 		TVITEMEX tvi;
 		tvi.mask = TVIF_STATE;
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp
index c2ffcb3210..ac71f76d4e 100644
--- a/src/mir_core/src/Windows/CDlgBase.cpp
+++ b/src/mir_core/src/Windows/CDlgBase.cpp
@@ -355,6 +355,9 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 						m_bExiting = false;
 					else if (!OnApply())
 						m_bExiting = false;
+
+					for (auto &it : m_controls)
+						it->m_bChanged = false;
 					break;
 
 				case PSN_RESET: