bugfixes

3 files changed, 2 insertions, 4 deletions

diff --git a/main.cpp b/main.cpp
index e14ff6c..e4a92fc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -150,7 +150,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 		  {

 			  string out;

 			  DWORD code;

-			  wstring cmd = _T("--batch --export -a ");

+			  wstring cmd = _T("--batch -a --export ");

 			  cmd += fp;

 			  if(pxExecute(&cmd, "", &out, &code) == pxNotFound)

 			  {

@@ -751,7 +751,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 			  extern HWND hPubKeyEdit;

 			  string out;

 			  DWORD code;

-			  wstring cmd = _T("--batch --export -a ");

+			  wstring cmd = _T("--batch -a --export ");

 			  cmd += id;
 			  if(pxExecute(&cmd, "", &out, &code) == pxNotFound)

 			  {

diff --git a/messages.cpp b/messages.cpp
index f7e0d9c..78994e5 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -101,7 +101,6 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 						DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);

 						setSrmmIcon(ccs->hContact);

 						setClistIcon(ccs->hContact);

-						return 0;

 					}

 					if(isContactHaveKey(ccs->hContact))

 					{

diff --git a/options.cpp b/options.cpp
index e00ebbd..70ffc24 100644
--- a/options.cpp
+++ b/options.cpp
@@ -673,7 +673,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 			  mir_free(tmp);
 			  DeleteFile(tmp2);
 		  }
-		  delete [] tmp;
 		  key_buf.clear();
 		  if(IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ENCRYPTION))
 		  {