From 285552136f36ecc8d1bfd6b4c7e6caf2a7420504 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Fri, 3 Jun 2005 22:17:06 +0000 Subject: [PATCH] Fix incorrect tinderbox popups with fastback (bug 292933). Make sure mLSHE is nulled out when we finish fastback navigation. r+sr=darin, a=brendan. git-svn-id: svn://10.0.0.236/trunk@174135 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 925482aa6c0..576d58f958a 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -5188,8 +5188,13 @@ nsDocShell::RestorePresentation(nsISHEntry *aSHEntry, PRBool aSavePresentation, nsDoc->SetTitle(title); } + // aSHEntry is now our currently-loaded document. mOSHE = aSHEntry; + // Clear the mLSHE reference to indicate document loading is done one + // way or another. + mLSHE = nsnull; + // mEODForCurrentDocument is true here, so EndPageLoad will not fire // onload (we fire that below, in a special way so that the content window // does not see it).