From ea4b2d7ed6a362cb117480e8edb60c8177b37e60 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Tue, 8 Oct 2002 19:07:29 +0000 Subject: [PATCH] Fix code inside a phoenix ifdef. NPOB. git-svn-id: svn://10.0.0.236/trunk@131444 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsGlobalWindow.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index d11d18f0c78..27b2b102fc3 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -2901,8 +2901,10 @@ GlobalWindowImpl::CheckForAbusePoint () #ifdef MOZ_PHOENIX // see the definition of the function for details. - if (!IsPopupWhitelisted(mDocument)) - FirePopupBlockedEvent(mDocument); + PRBool whitelisted = IsPopupWhitelisted(mDocument); + if (!whitelisted) + FirePopupBlockedEvent(mDocument); + return !whitelisted; #else return PR_TRUE; #endif @@ -2926,9 +2928,10 @@ GlobalWindowImpl::CheckForAbusePoint () #endif #ifdef MOZ_PHOENIX - // see the definition of the function for details. - if (!IsPopupWhitelisted(mDocument)) + PRBool whitelisted = IsPopupWhitelisted(mDocument); + if (!whitelisted) FirePopupBlockedEvent(mDocument); + return !whitelisted; #else return PR_TRUE; #endif