From 20cc26d58c38dab5ecda407b9483b9190a91db6e Mon Sep 17 00:00:00 2001 From: "radha%netscape.com" Date: Tue, 18 Jul 2000 22:24:27 +0000 Subject: [PATCH] Possible fix for 45297. r=pollmann git-svn-id: svn://10.0.0.236/trunk@74398 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 3e54b340b3c..17d7343a0a9 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1263,7 +1263,7 @@ NS_IMETHODIMP nsDocShell::Reload(PRInt32 aReloadType) nsDocShellInfoLoadType type = nsIDocShellLoadInfo::loadReloadNormal; if ( aReloadType == nsIWebNavigation::loadReloadBypassProxyAndCache ) type = nsIDocShellLoadInfo::loadReloadBypassProxyAndCache; - +#if 0 nsCOMPtr entry; if (OSHE) { /* We should fall here in most cases including subframes & refreshes */ @@ -1284,9 +1284,18 @@ NS_IMETHODIMP nsDocShell::Reload(PRInt32 aReloadType) nsnull, type); } +#else + // OK. Atleast for the heck of it, pollmann says that he doesn't crash + // in bug 45297 if he just did the following, instead of the one in #if 0. + // If this really keeps the crash from re-occuring, may be this can stay. However + // there is no major difference between this one and the one inside #if 0 + + return InternalLoad(mCurrentURI, mReferrerURI, nsnull, nsnull, + nsnull, type); +#endif /* 0 */ - return LoadHistoryEntry(entry, type); + // return LoadHistoryEntry(entry, type); #else