Commit e8dbbd11 authored by Laurent Montel's avatar Laurent Montel 😁

Fix Bug 379971 - kmail asserts whenever I drop a mail into composer

BUG: 379971
parent fb52fcc6
...@@ -2122,10 +2122,16 @@ void KMComposerWin::slotFetchJob(KJob *job) ...@@ -2122,10 +2122,16 @@ void KMComposerWin::slotFetchJob(KJob *job)
if (items.first().mimeType() == KMime::Message::mimeType()) { if (items.first().mimeType() == KMime::Message::mimeType()) {
uint identity = 0; uint identity = 0;
if (items.at(0).isValid() && items.at(0).parentCollection().isValid()) { if (items.at(0).isValid()) {
QSharedPointer<MailCommon::FolderSettings> fd(MailCommon::FolderSettings::forCollection(items.at(0).parentCollection(), false)); const Akonadi::Collection parentCollection = items.at(0).parentCollection();
if (fd) { if (parentCollection.isValid()) {
identity = fd->identity(); const QString resourceName = parentCollection.resource();
if (!resourceName.isEmpty()) {
QSharedPointer<MailCommon::FolderSettings> fd(MailCommon::FolderSettings::forCollection(parentCollection, false));
if (fd) {
identity = fd->identity();
}
}
} }
} }
KMCommand *command = new KMForwardAttachedCommand(this, items, identity, this); KMCommand *command = new KMForwardAttachedCommand(this, items, identity, this);
......
Markdown is supported
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