Verified Commit 1318d2e1 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Fix logic error in keyresolver fallback to s/mime

We want to resolve to S/MIME if the format includes
S/MIME and the format is not auto and could be resolved
by OpenPGP. Because in the second case we just go with OpenPGP.

GnuPG-Bug-Id: T3929
parent 0d721662
......@@ -527,7 +527,7 @@ void KeyResolver::start(bool showApproval, QWidget *parentWidget)
}
bool pgpOnly = d->mUnresolvedPGP.empty() && (!d->mSign || d->mSigKeys.contains(AnyOpenPGP));
if (d->mFormat & AnySMIME && (d->mFormat != AutoFormat && pgpOnly)) {
if (d->mFormat & AnySMIME && !(d->mFormat == AutoFormat && pgpOnly)) {
d->resolveSign(GpgME::CMS);
d->resolveEnc(GpgME::CMS);
}
......
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