mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
fix instance of 123063 indefinite stall on save to imap folder, fix cancel of fcc sr=mscott, a=sspitzer
This commit is contained in:
parent
083a9272e5
commit
3660b3fd83
@ -198,6 +198,13 @@ NS_IMETHODIMP nsMsgProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequ
|
||||
m_pendingStateFlags = aStateFlags;
|
||||
m_pendingStateValue = aStatus;
|
||||
|
||||
nsCOMPtr<nsIMsgWindow> msgWindow (do_QueryReferent(m_msgWindow));
|
||||
if (aStateFlags == nsIWebProgressListener::STATE_STOP && msgWindow && NS_FAILED(aStatus))
|
||||
{
|
||||
msgWindow->StopUrls();
|
||||
msgWindow->SetStatusFeedback(nsnull);
|
||||
}
|
||||
|
||||
if (m_listenerList)
|
||||
{
|
||||
PRUint32 count = 0;
|
||||
@ -217,13 +224,6 @@ NS_IMETHODIMP nsMsgProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequ
|
||||
}
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIMsgWindow> msgWindow (do_QueryReferent(m_msgWindow));
|
||||
if (aStateFlags == nsIWebProgressListener::STATE_STOP && msgWindow && NS_FAILED(aStatus))
|
||||
{
|
||||
msgWindow->StopUrls();
|
||||
msgWindow->SetStatusFeedback(nsnull);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -3944,6 +3944,7 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
|
||||
nsMsgAskBooleanQuestionByID(prompt, NS_MSG_ERROR_DOING_FCC, &retry, nsnull /* what title */);
|
||||
if (retry)
|
||||
{
|
||||
mSendProgress = nsnull; // this was cancelled, so we need to clear it.
|
||||
return DoFcc();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user