Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 14967. r=pollmann, a=chofmann

Browse Source
This commit is contained in:
radha%netscape.com 1999-09-28 22:17:49 +00:00
parent c97367cce4
commit 475df26c39
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xpfe/appshell/src/nsSessionHistory.cpp
View File

@ -260,13 +260,16 @@ nsresult
nsHistoryEntry::GetHistoryState(nsISupports ** aResult)
{
*aResult = mHistoryState;
NS_IF_ADDREF(mHistoryState);
return NS_OK;
}
nsresult
nsHistoryEntry::SetHistoryState(nsISupports * aState)
{
NS_IF_RELEASE(mHistoryState);
mHistoryState = aState;
NS_IF_ADDREF(aState);
return NS_OK;
}
@ -514,9 +517,9 @@ nsHistoryEntry::Load(nsIWebShell * aPrevEntry, PRBool aIsReload) {
/* Get the child count of the current page and previous page */
PRInt32 pcount=0, ccount=0;
prev->GetChildCount(pcount);
ccount = cur->GetChildCnt();
nsISupports * historyObject = nsnull;
GetHistoryState(&historyObject);
ccount = cur->GetChildCnt();
nsCOMPtr<nsISupports> historyObject;
GetHistoryState(getter_AddRefs(historyObject));
prev->LoadURL(cURL, nsnull, PR_FALSE, (nsLoadFlags) (aIsReload?nsIChannel::LOAD_NORMAL:LOAD_HISTORY), 0, historyObject);
if (aIsReload && (pcount > 0)) {
/* If this is a reload, on a page with frames, you want to return