Bug 451898. When stopping an error page load, make sure to null out mLSHE. r=biesi, a=samuelsidler

git-svn-id: svn://10.0.0.236/trunk@257853 18797224-902f-48f8-a5cc-f745e15eee43
2009-07-29 21:26:29 +00:00
parent 15334bed7b
commit ea3a86ed4b
1 changed files with 6 additions and 0 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3405,6 +3405,12 @@ nsDocShell::Stop(PRUint32 aStopFlags)
    // Revoke any pending event related to content viewer restoration
    mRestorePresentationEvent.Revoke();

+    if (mLoadType == LOAD_ERROR_PAGE && mLSHE) {
+        // Since error page loads never unset mLSHE, do so now
+        SetHistoryEntry(&mOSHE, mLSHE);
+        SetHistoryEntry(&mLSHE, nsnull);
+    }
+
    if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
        // Stop the document loading
        if (mContentViewer)