From 4faf5b3ee7d73a4c3416faff4566ef5b1166eec0 Mon Sep 17 00:00:00 2001
From: "rpotts%netscape.com"
 <rpotts%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 19 Aug 1999 09:21:07 +0000
Subject: [PATCH] Changed OnEndDocumentLoad(...) to use the document loader as
 the descriminator to decide if it should handle the notification...

git-svn-id: svn://10.0.0.236/branches/SeaMonkey_M9_BRANCH@43578 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 4 ++--
 mozilla/webshell/src/nsWebShell.cpp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index a2fcd734c2a..bde56ce7a0d 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -2782,7 +2782,6 @@ nsWebShell::ReloadDocument(const char* aCharset,
   mHintCharsetSource= aSource;
 
   return Reload( nsIChannel::LOAD_NORMAL);
-
 }
 
 NS_IMETHODIMP
@@ -3232,7 +3231,8 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
   if (NS_FAILED(rv)) return rv;
 #endif
 
-  if (!mProcessedEndDocumentLoad) {
+//if (!mProcessedEndDocumentLoad) {
+  if (loader == mDocLoader) {
     mProcessedEndDocumentLoad = PR_TRUE;    
 
     if (nsnull != mScriptGlobal) {
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index a2fcd734c2a..bde56ce7a0d 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -2782,7 +2782,6 @@ nsWebShell::ReloadDocument(const char* aCharset,
   mHintCharsetSource= aSource;
 
   return Reload( nsIChannel::LOAD_NORMAL);
-
 }
 
 NS_IMETHODIMP
@@ -3232,7 +3231,8 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
   if (NS_FAILED(rv)) return rv;
 #endif
 
-  if (!mProcessedEndDocumentLoad) {
+//if (!mProcessedEndDocumentLoad) {
+  if (loader == mDocLoader) {
     mProcessedEndDocumentLoad = PR_TRUE;    
 
     if (nsnull != mScriptGlobal) {