diff options
| -rwxr-xr-x | messages.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/messages.cpp b/messages.cpp index 1d7e555..dc249da 100755 --- a/messages.cpp +++ b/messages.cpp @@ -924,23 +924,20 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L if(_tcslen(tmp) > 0) { extern TCHAR *password; - if(password && password[0]) + if(IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD)) { - if(IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD)) + if(inkeyid && inkeyid[0] && !IsDlgButtonChecked(hwndDlg, IDC_DEFAULT_PASSWORD)) { - 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); + string dbsetting = "szKey_"; + dbsetting += inkeyid; + dbsetting += "_Password"; + DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), tmp); } - if(password) - delete [] password; + else + DBWriteContactSettingTString(NULL, szGPGModuleName, "szKeyPassword", tmp); } + if(password) + delete [] password; password = new TCHAR [_tcslen(tmp)+1]; _tcscpy(password, tmp); } |