summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-09-14 17:15:04 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-09-14 17:15:04 +0300
commit73815a8f028cee1caf3e7ce597fbb409cc0c5396 (patch)
tree337fd306d86025c9c5c8887d48c597386ef79ac3
parentee194854bb7069fa813db779cc135fde6fde454b (diff)
we need to verify, not decrypt, this also fixes thread hang )
-rw-r--r--utilities.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/utilities.cpp b/utilities.cpp
index 3eaf9a7..9cba16a 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -589,7 +589,7 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
{ //gpg
string out;
DWORD code;
- wstring cmd = _T(" -d -a \"");
+ wstring cmd = _T(" --verify -a \"");
cmd += path_out;
cmd += _T("\"");
gpg_execution_params params;
@@ -605,6 +605,8 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
TerminateThread(gpg_thread, 0);
MessageBox(0, _T("GPG execution timed out, aborted"), _T(""), MB_OK);
}
+ DeleteFile(path_out.c_str());
+ ReleaseMutex(sign_file_mutex);
if(result == pxNotFound)
{
MessageBox(0, _T("Set path to gpg.exe first!"), _T("Warning"), MB_OK);
@@ -616,8 +618,6 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
string::size_type p2 = out.find("\n", p);
}
}
- DeleteFile(path_out.c_str());
- ReleaseMutex(sign_file_mutex);
return FALSE;
}
}