www

commit 1ee015317f3049d8d173801e5eede7b7e6062af8
parent ea50098d300507ee2a0ca94320c922e72f92c409
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 11 Dec 2013 14:50:48 -0500

Don't restart in connector mode on Zotero.init() failure

I broke this in a723c8599949a64f6af10c81a8a652feeeaee57c

Diffstat:
M
components/zotero-service.js
 | 
14
+++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/components/zotero-service.js b/components/zotero-service.js
@@ -295,11 +295,15 @@ function ZoteroService() {
 			try {
 				zContext.Zotero.init(zInitOptions);
 			} catch(e) {
-				// if Zotero should start as a connector, reload it
-				zContext.Zotero.shutdown().then(function() {
-					makeZoteroContext(true);
-					zContext.Zotero.init(zInitOptions);
-				}).done();
+				if(e === "ZOTERO_SHOULD_START_AS_CONNECTOR") {
+					// if Zotero should start as a connector, reload it
+					zContext.Zotero.shutdown().then(function() {
+						makeZoteroContext(true);
+						zContext.Zotero.init(zInitOptions);
+					}).done();
+				} else {
+					throw e;
+				}
 			}
 		}
 		isFirstLoadThisSession = false;	// no longer first load