Verified Commit 3ebfde6d authored by Ingo Klöcker's avatar Ingo Klöcker Committed by Ingo Klöcker
Browse files

Use error of decryption result also if decryption was canceled

This doesn't seem to change anything because logging shows that if the
decryption is canceled then the verification is also canceled (which
kind of makes sense because without prior decryption the verification
isn't possible). In any case, it feels more correct to return the
decryption error unless the decryption succeeded.

GnuPG-bug-id: 6196
parent 70c42e4a
......@@ -747,7 +747,7 @@ std::shared_ptr<DecryptVerifyResult> AbstractDecryptVerifyTask::fromDecryptResul
std::shared_ptr<DecryptVerifyResult> AbstractDecryptVerifyTask::fromDecryptVerifyResult(const DecryptionResult &dr, const VerificationResult &vr, const QByteArray &plaintext, const QString &fileName, const AuditLog &auditLog)
{
const auto err = dr.error() ? dr.error() : vr.error();
const auto err = dr.error().code() ? dr.error() : vr.error();
return std::shared_ptr<DecryptVerifyResult>(new DecryptVerifyResult(
DecryptVerify,
vr,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment