Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 82645. We should avoid to call GatherMimeAttachments in the case we call SnarfAttachment as this last one will call itself the first one. R=varada, SR=bienvenu, A=asa

Browse Source
This commit is contained in:
ducarroz%netscape.com 2001-05-30 23:58:03 +00:00
parent d423eb3a13
commit 51c0095a02
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mailnews/compose/src/nsMsgSend.cpp
View File

@ -2252,11 +2252,8 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
}
}
/*
if ( (attachments && attachments[0].url) ||
(mMultipartRelatedAttachmentCount > 0) ||
(mCompFieldRemoteAttachments > 0) )
*/
PRBool needToCallGatherMimeAttachments = PR_TRUE;
if (m_attachment_count > 0)
{
// If there is more than one mailbox URL, or more than one NNTP url,
@ -2311,6 +2308,11 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
PR_FREEIF(printfString);
}
/* As SnarfAttachment will call GatherMimeAttachments when it will be done (this is an async process),
we need to avoid to call it ourself.
*/
needToCallGatherMimeAttachments = PR_FALSE;
int status = m_attachments[i].SnarfAttachment(mCompFields);
if (status < 0)
return status;
@ -2320,7 +2322,7 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
}
// If no attachments - finish now (this will call the done_callback).
if (m_attachment_pending_count <= 0)
if (needToCallGatherMimeAttachments)
return GatherMimeAttachments();
return 0;