fixes #3208 (tabSRMM: не сохраняется изменение чекбоксов в настройках уведомлений о наборе)

2 files changed, 16 insertions, 18 deletions

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 641886c837..590afa2478 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -475,7 +475,6 @@ public:
 		ResetCList();

 

 		clist.OnListRebuilt = Callback(this, &COptionTypingDlg::RebuildList);

-		clist.OnCheckChanged = Callback(this, &COptionTypingDlg::onChange_Clist);

 		clist.OnOptionsChanged = Callback(this, &COptionTypingDlg::ResetCList);

 		return true;

 	}

@@ -487,11 +486,6 @@ public:
 		return true;

 	}

 

-	void onChange_Clist(CCtrlClc::TEventInfo*)

-	{

-		NotifyChange();

-	}

-

 	void onChange_Tray(CCtrlCheck*)

 	{

 		bool bStatus = chkTypeTray.GetState() != 0;

diff --git a/src/mir_core/src/Windows/CCtrlClc.cpp b/src/mir_core/src/Windows/CCtrlClc.cpp
index cf4f05cda6..3e208679d4 100644
--- a/src/mir_core/src/Windows/CCtrlClc.cpp
+++ b/src/mir_core/src/Windows/CCtrlClc.cpp
@@ -33,18 +33,22 @@ BOOL CCtrlClc::OnNotify(int, NMHDR *pnmh)
 {
 	TEventInfo evt = { this, (NMCLISTCONTROL *)pnmh };
 	switch (pnmh->code) {
-		case CLN_EXPANDED:       OnExpanded(&evt); break;
-		case CLN_LISTREBUILT:    OnListRebuilt(&evt); break;
-		case CLN_ITEMCHECKED:    OnItemChecked(&evt); break;
-		case CLN_DRAGGING:       OnDragging(&evt); break;
-		case CLN_DROPPED:        OnDropped(&evt); break;
-		case CLN_LISTSIZECHANGE: OnListSizeChange(&evt); break;
-		case CLN_OPTIONSCHANGED: OnOptionsChanged(&evt); break;
-		case CLN_DRAGSTOP:       OnDragStop(&evt); break;
-		case CLN_NEWCONTACT:     OnNewContact(&evt); break;
-		case CLN_CONTACTMOVED:   OnContactMoved(&evt); break;
-		case CLN_CHECKCHANGED:   OnCheckChanged(&evt); break;
-		case NM_CLICK:           OnClick(&evt); break;
+	case CLN_EXPANDED:       OnExpanded(&evt); break;
+	case CLN_LISTREBUILT:    OnListRebuilt(&evt); break;
+	case CLN_ITEMCHECKED:    OnItemChecked(&evt); break;
+	case CLN_DRAGGING:       OnDragging(&evt); break;
+	case CLN_DROPPED:        OnDropped(&evt); break;
+	case CLN_LISTSIZECHANGE: OnListSizeChange(&evt); break;
+	case CLN_OPTIONSCHANGED: OnOptionsChanged(&evt); break;
+	case CLN_DRAGSTOP:       OnDragStop(&evt); break;
+	case CLN_NEWCONTACT:     OnNewContact(&evt); break;
+	case CLN_CONTACTMOVED:   OnContactMoved(&evt); break;
+	case NM_CLICK:           OnClick(&evt); break;
+
+	case CLN_CHECKCHANGED:
+		OnCheckChanged(&evt);
+		NotifyChange();
+		break;
 	}
 	return FALSE;
 }