7 files changed, 7 insertions, 17 deletions
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 691b93074c..0d6fd81391 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -65,10 +65,8 @@ public:
 		chkCycle.SetState(iTrayIcon == SETTING_TRAYICON_CYCLE);
 		chkMulti.SetState(iTrayIcon == SETTING_TRAYICON_MULTI);
 		chkDontCycle.SetState(iTrayIcon == SETTING_TRAYICON_SINGLE);
-		onChange_Tray(0);
 		
 		chkDisableBlink.SetState(g_plugin.getBool("DisableTrayFlash", false));
-		onChange_DisableBlink(0);
 
 		blink.SetPosition(g_plugin.getWord("IconFlashTime", 550));
 		cycleTime.SetPosition(g_plugin.getWord("CycleTime", SETTING_CYCLETIME_DEFAULT));
diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp
index cabbcdeba9..8587219961 100644
--- a/src/core/stdfile/src/fileopts.cpp
+++ b/src/core/stdfile/src/fileopts.cpp
@@ -132,8 +132,6 @@ public:
 		default: CheckDlgButton(m_hwnd, IDC_ASK, BST_CHECKED); break;
 		}
 
-		onChange_NoScanner(0);
-		onChange_AutoAccept(0);
 		return true;
 	}
 
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index a089c3d70f..97cd62c2bb 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -382,7 +382,6 @@ public:
 		edtHighlight.Enable(g_Settings.bHighlightEnabled);
 
 		chkLogging.SetState(g_Settings.bLoggingEnabled);
-		onChange_Logging(nullptr);
 		return true;
 	}
 
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 561ef27cf0..3af47d719d 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -245,8 +245,6 @@ public:
 		DWORD msgTimeout = g_dat.msgTimeout;
 		edtSecs.SetInt((msgTimeout >= 5000) ? msgTimeout / 1000 : 5);
 		
-		onChange_Avatar(nullptr);
-
 		chkCascade.Enable(!g_dat.bSavePerContact);
 		chkCtrlSupport.Enable(!g_dat.bAutoClose);
 		return true;
@@ -358,8 +356,6 @@ public:
 
 		spinCount.SetPosition(g_dat.nLoadCount);
 		spinTime.SetPosition(g_dat.nLoadTime);
-
-		onChange_Time(nullptr);
 		return true;
 	}
 
@@ -485,8 +481,6 @@ public:
 		clist.OnListRebuilt = Callback(this, &COptionTypingDlg::RebuildList);
 		clist.OnCheckChanged = Callback(this, &COptionTypingDlg::onChange_Clist);
 		clist.OnOptionsChanged = Callback(this, &COptionTypingDlg::ResetCList);
-
-		onChange_ShowNotify(nullptr);
 		return true;
 	}
 
@@ -542,7 +536,6 @@ public:
 		m_chkTabs.SetState(g_Settings.bTabsEnable);
 		m_chkTabsBottom.SetState(g_Settings.bTabsAtBottom);
 		m_chkTabsClose.SetState(g_Settings.bTabCloseOnDblClick);
-		onChange_Tabs(&m_chkTabs);
 		return true;
 	}
 
diff --git a/src/mir_app/src/sounds.cpp b/src/mir_app/src/sounds.cpp
index 64d7a58a6f..99061f85a7 100644
--- a/src/mir_app/src/sounds.cpp
+++ b/src/mir_app/src/sounds.cpp
@@ -132,7 +132,6 @@ public:
 		RebuildTree();
 		m_tree.SetItemState(0, TVIS_SELECTED, TVIS_SELECTED);
 		chkSounds.SetState(db_get_b(0, "Skin", "UseSound", 0) != 0);
-		onChange_Sounds(0);
 		return true;
 	}
 
diff --git a/src/mir_core/src/CCtrlBase.cpp b/src/mir_core/src/CCtrlBase.cpp
index 3c1c08db87..50d3366454 100644
--- a/src/mir_core/src/CCtrlBase.cpp
+++ b/src/mir_core/src/CCtrlBase.cpp
@@ -89,12 +89,14 @@ bool CCtrlBase::Enabled() const
 
 void CCtrlBase::NotifyChange()
 {
-	if (!m_parentWnd || !m_parentWnd->IsInitialized())
+	if (!m_parentWnd)
 		return;
 
-	m_bChanged = true;
-	if (!m_bSilent)
-		m_parentWnd->NotifyChange();
+	if (m_parentWnd->IsInitialized()) {
+		m_bChanged = true;
+		if (!m_bSilent)
+			m_parentWnd->NotifyChange();
+	}
 
 	OnChange(this);
 }
diff --git a/src/mir_core/src/CCtrlCheck.cpp b/src/mir_core/src/CCtrlCheck.cpp
index 9c50db8849..6c94fa20cc 100644
--- a/src/mir_core/src/CCtrlCheck.cpp
+++ b/src/mir_core/src/CCtrlCheck.cpp
@@ -58,6 +58,7 @@ int CCtrlCheck::GetState()
 void CCtrlCheck::SetState(int state)
 {
 	::SendMessage(m_hwnd, BM_SETCHECK, state, 0);
+	OnChange(this);
 }
 
 bool CCtrlCheck::IsChecked()