From 96df566be1ab0fb187290fe2832d6586baedc858 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 6 Aug 2006 20:30:37 +0000
Subject: [PATCH] Bug 347457: If a readonly engine has updates, and the icon
 load callback runs first, an exception is thrown, r=mconnor

git-svn-id: svn://10.0.0.236/trunk@206689 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/search/nsSearchService.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mozilla/browser/components/search/nsSearchService.js b/mozilla/browser/components/search/nsSearchService.js
index f3df386d078..aa31b5c5e05 100755
--- a/mozilla/browser/components/search/nsSearchService.js
+++ b/mozilla/browser/components/search/nsSearchService.js
@@ -1161,11 +1161,6 @@ Engine.prototype = {
     if (aEngine._engineToUpdate) {
       engineToUpdate = aEngine._engineToUpdate.wrappedJSObject;
 
-      if (engineToUpdate._readOnly) {
-        LOG("_onLoad: Can't update readonly engine!");
-        return;
-      }
-
       // Make this new engine use the old engine's file.
       aEngine._file = engineToUpdate._file;
     }
@@ -2888,7 +2883,7 @@ var engineUpdateService = {
     ULOG("currentTime: " + currentTime);
     for each (engine in searchService.getEngines({})) {
       engine = engine.wrappedJSObject;
-      if (!engine._hasUpdates)
+      if (!engine._hasUpdates || engine._readOnly)
         continue;
 
       ULOG("checking " + engine.name);