From 4d8b70aaee170fa46116f10ef3eed3eb30ceffea Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Wed, 26 Oct 2011 12:27:21 +0300
Subject: fixed crash on key password enter

---
 messages.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'messages.cpp')

diff --git a/messages.cpp b/messages.cpp
index ab6197c..1d7e555 100755
--- a/messages.cpp
+++ b/messages.cpp
@@ -924,20 +924,23 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			if(_tcslen(tmp) > 0)
 			{
 				extern TCHAR *password;
-				if(IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD))
+				if(password && password[0])
 				{
-					if((strlen(inkeyid) > 0) && !IsDlgButtonChecked(hwndDlg, IDC_DEFAULT_PASSWORD))
+					if(IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD))
 					{
-						string dbsetting = "szKey_";
-						dbsetting += inkeyid;
-						dbsetting += "_Password";
-						DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), tmp);
+						if((strlen(inkeyid) > 0) && !IsDlgButtonChecked(hwndDlg, IDC_DEFAULT_PASSWORD))
+						{
+							string dbsetting = "szKey_";
+							dbsetting += inkeyid;
+							dbsetting += "_Password";
+							DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), tmp);
+						}
+						else
+							DBWriteContactSettingTString(NULL, szGPGModuleName, "szKeyPassword", tmp);
 					}
-					else
-						DBWriteContactSettingTString(NULL, szGPGModuleName, "szKeyPassword", tmp);
+					if(password)
+						delete [] password;
 				}
-				if(password)
-					delete [] password;
 				password = new TCHAR [_tcslen(tmp)+1];
 				_tcscpy(password, tmp);
 			}
-- 
cgit v1.2.3