fixes #2697 (Scriver: падение при попытке зайти в настройки)

2 files changed, 2 insertions, 8 deletions

diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc
index d7cc7e427b..97a45e8480 100644
--- a/src/core/stdmsg/res/resource.rc
+++ b/src/core/stdmsg/res/resource.rc
@@ -43,8 +43,8 @@ BEGIN
     CONTROL         "Use the contact's status icon as the window icon",IDC_STATUSWIN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,75,290,10

     CONTROL         "Save the window size and location individually for each contact",IDC_SAVEPERCONTACT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,88,289,10

-    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,100,289,10

+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,88,289,10

+    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,100,289,10

     CONTROL         "Support Ctrl+Up/Down in message area to show previously sent messages",IDC_CTRLSUPPORT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,112,289,10

     CONTROL         "Delete temporary contacts when closing message window",IDC_DELTEMP,

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 49aeb6873b..5f1051f0b6 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -214,7 +214,6 @@ public:
 		chkAutoMin.OnChange = Callback(this, &COptionMainDlg::onChange_AutoMin);

 		chkAutoClose.OnChange = Callback(this, &COptionMainDlg::onChange_AutoClose);

 		chkLimitAvatar.OnChange = Callback(this, &COptionMainDlg::onChange_LimitAvatar);

-		chkSavePerContact.OnChange = Callback(this, &COptionMainDlg::onChange_SavePerContact);

 

 		CreateLink(edtNFlash, g_dat.nFlashMax);

 		CreateLink(edtAvatarH, g_dat.iAvatarHeight);

@@ -275,11 +274,6 @@ public:
 		chkCtrlSupport.Enable(!chkAutoClose.GetState());

 	}

 

-	void onChange_SavePerContact(CCtrlCheck*)

-	{

-		chkCascade.Enable(!chkSavePerContact.GetState());

-	}

-

 	void onChange_Avatar(CCtrlCheck*)

 	{

 		bool bEnabled = chkAvatar.GetState();