From 1feb5c5fc23870041f93b104f54bbd157a5e47c6 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 9 Feb 2012 14:01:31 -0500
Subject: [PATCH] Translators that specify an error handler for a child
 translator shouldn't throw on error

---
 chrome/content/zotero/xpcom/translation/translate.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index deb6e1859..4db52ca9d 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -219,7 +219,9 @@ Zotero.Translate.Sandbox = {
 				return translation.setSearch(arg);
 			};
 			safeTranslator.setDocument = function(arg) { return translation.setDocument(arg) };
+			var errorHandlerSet = false;
 			safeTranslator.setHandler = function(arg1, arg2) {
+				if(arg1 === "error") errorHandlerSet = true;
 				translation.setHandler(arg1, 
 					function(obj, item) {
 						try {
@@ -288,7 +290,7 @@ Zotero.Translate.Sandbox = {
 				return translation.getTranslators();
 			};
 			
-			var errorHandlerSet = false, doneHandlerSet = false;
+			var doneHandlerSet = false;
 			safeTranslator.translate = function() {
 				translate.incrementAsyncProcesses("safeTranslator#translate()");
 				setDefaultHandlers(translate, translation);