modified: gpg_wrapper.cpp

	modified:   gpg_wrapper.h
	modified:   main.cpp
	modified:   messages.cpp
	modified:   options.cpp
	modified:   utilities.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/options.cpp b/options.cpp
index 04cb56b..c9b9de7 100644
--- a/options.cpp
+++ b/options.cpp
@@ -257,6 +257,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					  {

 						  gpg_thread.~thread();

 						  TerminateProcess(params.hProcess, 1);

+						  params.hProcess = NULL;

 						  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

 						  mir_free(tmp);

 						  break;

@@ -466,6 +467,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					  {

 						  gpg_thread.~thread();

 						  TerminateProcess(params.hProcess, 1);

+						  params.hProcess = NULL;

 					  }

 					  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp_path);

 					  mir_free(tmp_path);

@@ -712,6 +714,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 					{

 						gpg_thread.~thread();

 						TerminateProcess(params.hProcess, 1);

+						params.hProcess = NULL;

 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";

 					}

 					if((out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----") != string::npos) && (out.find("-----END PGP PUBLIC KEY BLOCK-----") != string::npos))

@@ -864,6 +867,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 				  {

 					  gpg_thread.~thread();

 					  TerminateProcess(params.hProcess, 1);

+					  params.hProcess = NULL;

 					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

 					  break;

 				  }

@@ -1100,6 +1104,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
 						  {

 							  gpg_thread.~thread();

 							  TerminateProcess(params.hProcess, 1);

+							  params.hProcess = NULL;

 							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";

 							  break;

 						  }