From e0d2e686934b174257ac96048e7c3891382308d7 Mon Sep 17 00:00:00 2001
From: "karnaze%netscape.com"
 <karnaze%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 25 Nov 1998 18:11:26 +0000
Subject: [PATCH] fixed the crash on bug 1588 (rsac.org). There is still a
 scrolling problem

git-svn-id: svn://10.0.0.236/trunk@15306 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsFrameSetFrame.cpp    | 22 +++++++++++--------
 .../html/document/src/nsFrameSetFrame.cpp     | 22 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index 1739e18911f..aedbb59d08e 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -457,16 +457,20 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsIPresContext& aPresContext,
                                            nsGUIEvent* aEvent,
                                            nsEventStatus& aEventStatus)
 {
-  // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN
-  switch (aEvent->message) {
-    case NS_MOUSE_MOVE:
-      MouseDrag(aPresContext, aEvent);
-	    break;
-    case NS_MOUSE_LEFT_BUTTON_UP:
-      EndMouseDrag();
-	    break;
+  if (mDragger) {
+    // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN
+    switch (aEvent->message) {
+      case NS_MOUSE_MOVE:
+        MouseDrag(aPresContext, aEvent);
+	      break;
+      case NS_MOUSE_LEFT_BUTTON_UP:
+        EndMouseDrag();
+	      break;
+    }
+    aEventStatus = nsEventStatus_eConsumeNoDefault;
+  } else {
+    aEventStatus = nsEventStatus_eIgnore;
   }
-  aEventStatus = nsEventStatus_eConsumeNoDefault;
   return NS_OK;
 }
 
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
index 1739e18911f..aedbb59d08e 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
@@ -457,16 +457,20 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsIPresContext& aPresContext,
                                            nsGUIEvent* aEvent,
                                            nsEventStatus& aEventStatus)
 {
-  // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN
-  switch (aEvent->message) {
-    case NS_MOUSE_MOVE:
-      MouseDrag(aPresContext, aEvent);
-	    break;
-    case NS_MOUSE_LEFT_BUTTON_UP:
-      EndMouseDrag();
-	    break;
+  if (mDragger) {
+    // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN
+    switch (aEvent->message) {
+      case NS_MOUSE_MOVE:
+        MouseDrag(aPresContext, aEvent);
+	      break;
+      case NS_MOUSE_LEFT_BUTTON_UP:
+        EndMouseDrag();
+	      break;
+    }
+    aEventStatus = nsEventStatus_eConsumeNoDefault;
+  } else {
+    aEventStatus = nsEventStatus_eIgnore;
   }
-  aEventStatus = nsEventStatus_eConsumeNoDefault;
   return NS_OK;
 }