From a1710c3307ec0e8b71bd2afa607b93a4ec700b11 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 16 Nov 2016 10:53:21 -0500 Subject: [PATCH] Fix hang running tests (since d88cfc6c5f) --- chrome/content/zotero/xpcom/schema.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index 639b2aac8..fdf6e10d4 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -462,20 +462,22 @@ Zotero.Schema = new function(){ } installLocation = installLocation.path; + let reinitOptions = { fromSchemaUpdate: true, noReinit: true }; + // Update files switch (mode) { case 'styles': - yield Zotero.Styles.reinit({ fromSchemaUpdate: true, noReinit: true }); + yield Zotero.Styles.reinit(reinitOptions); var updated = yield _updateBundledFilesAtLocation(installLocation, mode); case 'translators': - yield Zotero.Translators.reinit({ fromSchemaUpdate: true, noReinit: true }); + yield Zotero.Translators.reinit(reinitOptions); var updated = yield _updateBundledFilesAtLocation(installLocation, mode); default: - yield Zotero.Translators.reinit({ fromSchemaUpdate: true, noReinit: true }); + yield Zotero.Translators.reinit(reinitOptions); let up1 = yield _updateBundledFilesAtLocation(installLocation, 'translators', true); - yield Zotero.Styles.reinit({ fromSchemaUpdate: true, noReinit: true }); + yield Zotero.Styles.reinit(reinitOptions); let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles'); var updated = up1 || up2; } @@ -1660,8 +1662,8 @@ Zotero.Schema = new function(){ } // Rebuild caches - yield Zotero.Translators.reinit(); - yield Zotero.Styles.reinit(); + yield Zotero.Translators.reinit({ fromSchemaUpdate: true }); + yield Zotero.Styles.reinit({ fromSchemaUpdate: true }); } catch (e) { Zotero.debug(e, 1);