From 527b02fbe9a41ab35516b4c39d04ddd0eabce8fd Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Feb 2004 06:18:41 +0000
Subject: [PATCH] Don't error out if keyword.enabled is just not set.  Bug
 229083, patch by Patrick McCormick <patrick@meer.net>, r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@152206 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index c47531b6035..3cee85c9357 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -799,10 +799,8 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
       {
         PRBool keywordsEnabled = PR_FALSE;
 
-        if(mPrefs) {
-          rv = mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled);
-          if (NS_FAILED(rv)) return rv;
-        }
+        if (mPrefs && NS_FAILED(mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled)))
+            keywordsEnabled = PR_FALSE;
 
         nsCAutoString host;
         url->GetHost(host);