Clear mWyciwygChannel even if the loadgroup tells us there was an error since the call succeeds anyway. bug 342191, r=jst sr=darin

git-svn-id: svn://10.0.0.236/trunk@200868 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2006-06-26 16:50:09 +00:00
parent b8e5f21e3e
commit 42ab54090e

View File

@@ -3623,21 +3623,18 @@ nsHTMLDocument::CreateAndAddWyciwygChannel(void)
nsresult
nsHTMLDocument::RemoveWyciwygChannel(void)
{
nsresult rv = NS_OK;
nsCOMPtr<nsILoadGroup> loadGroup = GetDocumentLoadGroup();
// note there can be a write request without a load group if
// this is a synchronously constructed about:blank document
if (loadGroup && mWyciwygChannel) {
mWyciwygChannel->CloseCacheEntry(NS_OK);
rv = loadGroup->RemoveRequest(mWyciwygChannel, nsnull, NS_OK);
NS_ENSURE_SUCCESS(rv, rv);
loadGroup->RemoveRequest(mWyciwygChannel, nsnull, NS_OK);
}
mWyciwygChannel = nsnull;
return rv;
return NS_OK;
}
void *