corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backing out my bug fix because it appears to have broken the page cycler.

Browse Source 
thanks to sspitzer for helping me figure this out.
This commit is contained in:
mscott@netscape.com
2000-04-07 21:36:09 +00:00
parent 010c1946ae
commit ccfb83137a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/nsWebShell.cpp
View File

@@ -1147,6 +1147,10 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
}
rv = NS_OpenURI(getter_AddRefs(pChannel), aUri, pNetService, loadGroup, requestor, aType);
if (NS_SUCCEEDED(rv)) {
// XXX wrong, but needed for now:
rv = pChannel->SetOriginalURI(referrer ? referrer.get() : aUri);
}
if (NS_FAILED(rv)) {
if (rv == NS_ERROR_DOM_RETVAL_UNDEFINED) // if causing the channel changed the
return NS_OK; // dom and there is nothing else to do
@@ -2324,7 +2328,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
if (NS_SUCCEEDED(rv)) {
urlString = spec;
if (nsnull != mContainer) {
rv = mContainer->EndLoadURL(this, urlString.GetUnicode(), aStatus);
rv = mContainer->EndLoadURL(this, urlString.GetUnicode(), 0);
}
nsCRT::free(spec);
}