зеркало из https://github.com/mozilla/gecko-dev.git
Fix for anchors that try and load content into a docshell that has already been destroyed. b=94229 r=ccarlen@netscape.com sr=rpotts@netscape.com
This commit is contained in:
Родитель
ac2ec34b5d
Коммит
f8d27dba10
|
@ -4114,7 +4114,6 @@ nsDocShell::InternalLoad(nsIURI * aURI,
|
|||
PRUint32 aLoadType,
|
||||
nsISHEntry * aSHEntry)
|
||||
{
|
||||
|
||||
nsresult rv;
|
||||
|
||||
nsCOMPtr<nsISupports> owner(aOwner);
|
||||
|
@ -4263,8 +4262,13 @@ nsDocShell::InternalLoad(nsIURI * aURI,
|
|||
return rv;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
// Load is being targetted at this docshell so return an error if the
|
||||
// docshell is in the process of being destroyed.
|
||||
//
|
||||
if (mIsBeingDestroyed) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
mURIResultedInDocument = PR_FALSE; // reset the clock...
|
||||
mLSHE = aSHEntry;
|
||||
|
|
Загрузка…
Ссылка в новой задаче