diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-04-13 16:43:43 +0300 |
| commit | 191c2e330ab91f4b35860e08c5424667ed1893c5 (patch) | |
| tree | 986158bd87ca65c1a3a722f2593b9d32a1aede56 /gpg_wrapper.cpp | |
| parent | f1a201a3c3aeb1ec731d50568eb583a21ed1440c (diff) | |
| parent | 3d4fe3639635d0496906fb56b8014b14b0fd1ec7 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
messages.cpp
Diffstat (limited to 'gpg_wrapper.cpp')
| -rw-r--r-- | gpg_wrapper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp index 3ed7f4a..0a50667 100644 --- a/gpg_wrapper.cpp +++ b/gpg_wrapper.cpp @@ -21,7 +21,7 @@ //boost::mutex gpg_mutex; -pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result, HANDLE hProcess) +pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result, HANDLE hProcess, PROCESS_INFORMATION *pr) { // gpg_mutex.lock(); if(!gpg_configured) @@ -122,6 +122,8 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD while (TRUE) { + if(!pri.hProcess) + break; success=GetExitCodeProcess(pri.hProcess,aexitcode); if (success && *aexitcode!=STILL_ACTIVE) break; @@ -157,5 +159,5 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD void pxEexcute_thread(void *param) { gpg_execution_params *params = (gpg_execution_params*)param; - pxResult result = pxExecute(params->cmd, params->useless, params->out, params->code, params->result, params->hProcess); + pxResult result = pxExecute(params->cmd, params->useless, params->out, params->code, params->result, params->hProcess, params->proc); } |