From 423cae3c828073c8c1d5c7fa984f549f4e7f427f Mon Sep 17 00:00:00 2001
From: "mike%neoplanet.com"
 <mike%neoplanet.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 May 1999 14:23:54 +0000
Subject: [PATCH] Modified handling of Cancel flag sent to BeforeNavigate2 from
 BeginLoadURL.  Previously function called aShell->Stop() which was
 ineffective.  Changed function to return NS_ERROR_ABORT.

git-svn-id: svn://10.0.0.236/trunk@30691 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webshell/embed/ActiveX/WebShellContainer.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
index 568407e7ce0..c900d9a1bd9 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
@@ -134,10 +134,7 @@ CWebShellContainer::BeginLoadURL(nsIWebShell* aShell, const PRUnichar* aURL)
 
 	if (bCancel == VARIANT_TRUE)
 	{
-		if (aShell)
-		{
-			aShell->Stop();
-		}
+		return NS_ERROR_ABORT;
 	}
 	else
 	{