Show more startup errors in Standalone, with stack

This commit is contained in:
Dan Stillman 2016-12-06 06:12:54 -05:00
parent 5866a76312
commit 1d45f3d008

View File

@ -348,13 +348,14 @@ function ZoteroService() {
return zContext.Zotero.init(zInitOptions); return zContext.Zotero.init(zInitOptions);
}) })
} }
dump(e + "\n\n"); dump(e + "\n\n");
Components.utils.reportError(e); Components.utils.reportError(e);
if (!zContext.Zotero.startupError) { if (!zContext.Zotero.startupError) {
zContext.Zotero.startupError = e; zContext.Zotero.startupError = e.stack || e + "\n\n" + e.stack;
}
if (!isStandalone()) {
throw e;
} }
throw e;
}) })
.then(function () { .then(function () {
if (isStandalone()) { if (isStandalone()) {
@ -363,7 +364,9 @@ function ZoteroService() {
zContext.Zotero.startupErrorHandler(); zContext.Zotero.startupErrorHandler();
} }
else if (zContext.Zotero.startupError) { else if (zContext.Zotero.startupError) {
zContext.alert(zContext.Zotero.startupError); Cc["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Ci.nsIPromptService)
.alert(null, "Error", zContext.Zotero.startupError);
} }
zContext.Zotero.Utilities.Internal.quitZotero(); zContext.Zotero.Utilities.Internal.quitZotero();
} }