diff options
| author | Sandro Knauß <sknauss@kde.org> | 2016-10-10 13:01:15 +0200 |
|---|---|---|
| committer | Sandro Knauß <sknauss@kde.org> | 2016-10-10 13:01:15 +0200 |
| commit | 6b6f20ffbe06402abcc7d4721ad1f647c3fc4c46 (patch) | |
| tree | 6e2762d879c64373519b0506e9a66ddc27f04830 /framework/domain/composercontroller.cpp | |
| parent | 349e404b539c1f9d1feb54658e2e6fbbd2165462 (diff) | |
| parent | 5fa8608e9877eab40336a60ed8ed979aaf3cfbd0 (diff) | |
| download | kube-6b6f20ffbe06402abcc7d4721ad1f647c3fc4c46.tar.gz kube-6b6f20ffbe06402abcc7d4721ad1f647c3fc4c46.zip | |
Merge branch 'develop' into dev/mimetreeinterface
Diffstat (limited to 'framework/domain/composercontroller.cpp')
| -rw-r--r-- | framework/domain/composercontroller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp index 2dcf1bb1..b2ad7ecc 100644 --- a/framework/domain/composercontroller.cpp +++ b/framework/domain/composercontroller.cpp | |||
| @@ -133,7 +133,7 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft) | |||
| 133 | { | 133 | { |
| 134 | Sink::Query query(*message.value<Sink::ApplicationDomain::Mail::Ptr>()); | 134 | Sink::Query query(*message.value<Sink::ApplicationDomain::Mail::Ptr>()); |
| 135 | query.request<Sink::ApplicationDomain::Mail::MimeMessage>(); | 135 | query.request<Sink::ApplicationDomain::Mail::MimeMessage>(); |
| 136 | Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).then<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) { | 136 | Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).syncThen<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) { |
| 137 | m_existingMail = mail; | 137 | m_existingMail = mail; |
| 138 | const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage()); | 138 | const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage()); |
| 139 | if (!mailData.isEmpty()) { | 139 | if (!mailData.isEmpty()) { |