From df33b45fc1fb65577583f8266d1625039bb6d60f Mon Sep 17 00:00:00 2001
From: "danm-moz%comcast.net" <danm-moz%comcast.net>
Date: Tue, 3 Feb 2004 17:17:38 +0000
Subject: [PATCH] tweak last checkin to allow a maximum popup pref of 0

---
 dom/src/base/nsGlobalWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp
index e2f333f0bc0..6dd8d8f761c 100644
--- a/dom/src/base/nsGlobalWindow.cpp
+++ b/dom/src/base/nsGlobalWindow.cpp
@@ -3062,8 +3062,8 @@ GlobalWindowImpl::CheckForAbusePoint()
 
   // limit the number of simultaneously open popups
   intPref = 0;
-  gPrefBranch->GetIntPref("dom.popup_maximum", &intPref);
-  if (intPref > 0 && gOpenPopupSpamCount >= intPref)
+  nsresult gotPref = gPrefBranch->GetIntPref("dom.popup_maximum", &intPref);
+  if (NS_SUCCEEDED(gotPref) && intPref >= 0 && gOpenPopupSpamCount >= intPref)
     return openAbuseOverride;
 
   // is a timer running?