Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for assertions happening on every new docshell. b=110685 r=brade@netscape.com sr=darin@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@108491 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
2001-11-19 21:39:40 +00:00
parent 98b61e53df
commit 4026617021
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -4741,10 +4741,16 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
* frameset pages is to add new methods to nsIDocShellTreeItem.
* Hopefully I don't have to do that.
*/
if (NS_SUCCEEDED(aURI->Equals(mCurrentURI, &equalUri))
&& equalUri && !inputStream &&
(mLoadType == LOAD_NORMAL || mLoadType == LOAD_LINK || mLoadType == LOAD_REFRESH))
if ((mLoadType == LOAD_NORMAL ||
mLoadType == LOAD_LINK ||
mLoadType == LOAD_REFRESH) &&
!inputStream &&
mCurrentURI &&
NS_SUCCEEDED(aURI->Equals(mCurrentURI, &equalUri)) &&
equalUri)
{
mLoadType = LOAD_NORMAL_REPLACE;
}
/* If the user pressed shift-reload, cache will create a new cache key
* for the page. Save the new cacheKey in Session History.