From 2d6a1b354129fe72d04faaaa988f8263892419ce Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 5 Dec 2016 05:17:21 -0500
Subject: [PATCH] Do a better job of displaying startup errors

This helps ensure that the toolbar button opens an alert with the relevant
error instead of opening the Zotero pane with an infinite progress meter.
---
 components/zotero-service.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/zotero-service.js b/components/zotero-service.js
index 97d3ec301c..d6774bd7b6 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -351,6 +351,9 @@ function ZoteroService() {
 				
 				dump(e + "\n\n");
 				Components.utils.reportError(e);
+				if (!zContext.Zotero.startupError) {
+					zContext.Zotero.startupError = e;
+				}
 				throw e;
 			})
 			.then(function () {