From 0dcf9ff3c43ad260a71480bece33349316a6862f Mon Sep 17 00:00:00 2001
From: rainwater <rainwater@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 4 Sep 2002 20:47:03 +0000
Subject: [PATCH] added terminate process

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@922 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/nsExec/nsexec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c
index db32c875..e765cb89 100644
--- a/Contrib/nsExec/nsexec.c
+++ b/Contrib/nsExec/nsexec.c
@@ -81,7 +81,7 @@ void ExecScript(BOOL log) {
 		OSVERSIONINFO osv={sizeof(osv)};
 		HANDLE newstdout=0,read_stdout=0;
 		DWORD dwRead = 1;
-		DWORD dwExit = !STILL_ACTIVE;
+		DWORD dwExit;
 		HGLOBAL memory;
 		char *szBuf;
 		GetVersionEx(&osv);
@@ -106,7 +106,9 @@ void ExecScript(BOOL log) {
 			CloseHandle(read_stdout);
 			pushstring("error");
 		}
-		WaitForSingleObject(pi.hProcess,INFINITE);
+		if (WaitForSingleObject(pi.hProcess,INFINITE)==WAIT_TIMEOUT) {
+			TerminateProcess(pi.hProcess,GetExitCodeProcess(pi.hProcess,&dwExit));
+		}
 		PeekNamedPipe(read_stdout, 0, 0, 0, &dwRead, NULL);
 		memory = GlobalAlloc(GMEM_MOVEABLE,dwRead+1);
 		szBuf = (char *)GlobalLock(memory);