diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2012-07-29 01:01:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2012-07-29 01:01:18 +0300 |
| commit | 8ef18318d8f81a533c0e3bc5c10c76fec0be3b5f (patch) | |
| tree | 88eb30555006e99e5cc446eee4520f3f955eae99 /gpg_wrapper.cpp | |
| parent | 191c2e330ab91f4b35860e08c5424667ed1893c5 (diff) | |
| parent | 64c6452c697a05ab0b0d4bbbda167ddc35215397 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange
Conflicts:
main.cpp
messages.cpp
Diffstat (limited to 'gpg_wrapper.cpp')
| -rwxr-xr-x[-rw-r--r--] | gpg_wrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp index 0a50667..410a0d5 100644..100755 --- a/gpg_wrapper.cpp +++ b/gpg_wrapper.cpp @@ -1,4 +1,4 @@ -// Copyright © 2010 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result, HANDLE hProcess, PROCESS_INFORMATION *pr) { // gpg_mutex.lock(); - if(!gpg_configured) + if(!gpg_valid) return pxNotConfigured; extern logtofile debuglog; BOOL success; |