From e7792901613067651ec330c49204ddde2dbe34b3 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 9 Oct 2017 17:39:33 +0200 Subject: HtmlBodyResult --- framework/src/domain/mime/mailtemplates.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'framework/src') diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp index 8b2b49db..368d0cf3 100644 --- a/framework/src/domain/mime/mailtemplates.cpp +++ b/framework/src/domain/mime/mailtemplates.cpp @@ -863,12 +863,14 @@ void MailTemplates::reply(const KMime::Message::Ptr &origMsg, const std::functio auto plainBodyResult = plainBody + plainQuote; htmlMessageText(plainTextContent, htmlContent, stripSignature, [=] (const QString &body, const QString &headElement) { //The html body is complete - auto htmlBodyResult = htmlBody + quotedHtmlText(body); - if (alwaysPlain) { - htmlBodyResult.clear(); - } else { - makeValidHtml(htmlBodyResult, headElement); - } + const auto htmlBodyResult = [&]() { + if (!alwaysPlain) { + auto htmlBodyResult = htmlBody + quotedHtmlText(body); + makeValidHtml(htmlBodyResult, headElement); + return htmlBodyResult; + } + return QString{}; + }(); //Assemble the message addProcessedBodyToMessage(msg, plainBodyResult, htmlBodyResult, false); -- cgit v1.2.3