www

commit 693c0286eab490d243a9d8763a6a5d21d284e408
parent a4afb8c0c35d466ac5f10f6eb1d06540963efb54
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 22 Nov 2016 04:35:57 -0500

Slightly better handling of startup errors in Standalone

Run the startup error handler or show an alert with the startup error
string, and then quit Zotero

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

1 file changed, 12 insertions(+), 0 deletions(-)
diff --git a/components/zotero-service.js b/components/zotero-service.js
@@ -352,6 +352,18 @@ function ZoteroService() {
 				throw e;
 			})
 			.then(function () {
+				if (isStandalone) {
+					if (zContext.Zotero.startupErrorHandler || zContext.Zotero.startupError) {
+						if (zContext.Zotero.startupErrorHandler) {
+							zContext.Zotero.startupErrorHandler();
+						}
+						else if (zContext.Zotero.startupError) {
+							zContext.alert(zContext.Zotero.startupError);
+						}
+						zContext.Zotero.Utilities.Internal.quitZotero();
+					}
+					return;
+				}
 				zContext.Zotero.debug("Initialized in "+(Date.now() - start)+" ms");
 				isFirstLoadThisSession = false;
 			});