From 6b1b91acffcc90db9f6d8e0c466d44e2a6819dc3 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Thu, 9 Sep 2010 22:56:44 +0300 Subject: modified: init.cpp modified: messages.cpp modified: new_gpg.rc modified: options.cpp modified: utilities.cpp --- options.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index c615cb8..9c1dce4 100644 --- a/options.cpp +++ b/options.cpp @@ -1048,8 +1048,14 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP tmp[size]= '\0'; key_buf.append(tmp); delete [] tmp; + f.close(); + } + if(key_buf.empty()) + { + key_buf.clear(); + debuglog<<"info: Failed to read key file\n"; + break; } - f.close(); if(((ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) == wstring::npos) || ((ws1 = key_buf.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) == wstring::npos)) { MessageBox(0, _T("This is not public key"), _T("INFO"), MB_OK); -- cgit v1.2.3