From 77664979ae7f2e534e31f66aa9286d874d9da2bc Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Fri, 1 Apr 2011 10:14:07 +0300
Subject: 	modified:   gpg_wrapper.cpp 	modified:   gpg_wrapper.h 
 modified:   main.cpp 	modified:   messages.cpp 	modified:  
 options.cpp 	modified:   utilities.cpp

---
 main.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index cccb846..f2df7bb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -95,6 +95,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 					{
 						gpg_thread.~thread();
 						TerminateProcess(params.hProcess, 1);
+						params.hProcess = NULL;
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -189,6 +190,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  gpg_thread.~thread();
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -258,6 +260,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 						  {
 							  gpg_thread.~thread();
 							  TerminateProcess(params.hProcess, 1);
+							  params.hProcess = NULL;
 							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 							  break;
 						  }
@@ -330,6 +333,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  delete gpg_thread;
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -358,6 +362,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  {
 				  delete gpg_thread;
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -423,6 +428,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
+					  params.hProcess = NULL;
 					  debuglog<<time_str()<<": GPG execution timed out, aborted";
 					  break;
 				  }
@@ -454,6 +460,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
+					  params.hProcess = NULL;
 					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
 					  break;
 				  }
@@ -591,6 +598,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 			}
 			gpg_configured = false;
@@ -709,6 +717,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			  {
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  gpg_thread.~thread();
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			  }
@@ -797,6 +806,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 				{
 					TerminateProcess(params.hProcess, 1);
+					params.hProcess = NULL;
 					gpg_thread.~thread();
 					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				}
@@ -889,6 +899,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 					  gpg_configured = false;
 					  break;
@@ -922,6 +933,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(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";
 					  gpg_configured = false;
 					  break;
@@ -1238,6 +1250,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 				  {
 					  gpg_thread.~thread();
 					  TerminateProcess(params.hProcess, 1);
+					  params.hProcess = NULL;
 					  MessageBox(0, _T("GPG execution timed out, aborted"), _T(""), MB_OK);
 					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					  break;
@@ -1271,6 +1284,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 					{
 						gpg_thread.~thread();
 						TerminateProcess(params.hProcess, 1);
+						params.hProcess = NULL;
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -1432,6 +1446,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 					{
 						gpg_thread.~thread();
 						TerminateProcess(params.hProcess, 1);
+						params.hProcess = NULL;
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						break;
 					}
@@ -1540,6 +1555,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 			  {
 				  gpg_thread.~thread();
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				  break;
 			  }
@@ -1650,6 +1666,7 @@ static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wPara
 			  {
 				  gpg_thread.~thread();
 				  TerminateProcess(params.hProcess, 1);
+				  params.hProcess = NULL;
 				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			  }
 			  MessageBoxA(0, out.c_str(), "GPG output", MB_OK);
@@ -1771,6 +1788,7 @@ void InitCheck()
 			{
 				gpg_thread.~thread();
 				TerminateProcess(params.hProcess, 1);
+				params.hProcess = NULL;
 				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				return;
 			}
@@ -1883,6 +1901,7 @@ void ImportKey()
 		{
 			gpg_thread.~thread();
 			TerminateProcess(params.hProcess, 1);
+			params.hProcess = NULL;
 			debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 			return;
 		}
-- 
cgit v1.2.3