From bc034089a6b668111c96cba89648cb47c97b6b8e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 13 Jan 2017 02:36:04 -0500 Subject: [PATCH] Fix startup error loading Zotero service https://forums.zotero.org/discussion/63869/5-0-beta-standalone-blank-ui-upon-restart https://forums.zotero.org/discussion/63865/5-0-beta-library-wont-load Adding include.js to hiddenWindow.xul in 66549f9e6d seems to have created a race condition in which the Zotero service would fail on the third startup after the JS cache was cleared (e.g., on a new version, -purgecaches, or other changes in the profile). So, don't do that. Hopefully this isn't caused by other uses (e.g., in plugins) of include.js and was only happening because the hidden window is launched concurrently with standalone.xul on macOS. --- chrome/content/zotero-platform/mac/standalone/menuOverlay.xul | 2 +- chrome/content/zotero/standalone/hiddenWindow.xul | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul index 82ee57980e..12230da63d 100644 --- a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul +++ b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul @@ -83,7 +83,7 @@ + oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').Zotero.Utilities.Internal.openPreferences();"/>