From d4515655d47d722757734dcbc5da6f6ea1c444b8 Mon Sep 17 00:00:00 2001 From: "joki%netscape.com" Date: Thu, 9 Mar 2000 20:22:55 +0000 Subject: [PATCH] Fix for bug 31186, backout of part of fix for 28988. r:saari a:leaf and the rest of the irc crowd to fix tree blocker git-svn-id: svn://10.0.0.236/trunk@62485 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/events/src/nsEventListenerManager.cpp | 2 +- mozilla/layout/events/src/nsEventListenerManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 1314b463d06..64b63881434 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -1472,7 +1472,7 @@ nsresult nsEventListenerManager::HandleEvent(nsIPresContext* aPresContext, : nsEventStatus_eConsumeNoDefault; // This is correct - *aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT) || mDestroyed + *aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT) ? nsEventStatus_eConsumeNoDefault : *aEventStatus; diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp index 1314b463d06..64b63881434 100644 --- a/mozilla/layout/events/src/nsEventListenerManager.cpp +++ b/mozilla/layout/events/src/nsEventListenerManager.cpp @@ -1472,7 +1472,7 @@ nsresult nsEventListenerManager::HandleEvent(nsIPresContext* aPresContext, : nsEventStatus_eConsumeNoDefault; // This is correct - *aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT) || mDestroyed + *aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT) ? nsEventStatus_eConsumeNoDefault : *aEventStatus;