From 8383c5cda891bd1e7699c5763b129c0ed2b7dfa5 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 22 Nov 2016 03:32:16 -0500 Subject: [PATCH] Ignore failure trying to show data dir migration status message I saw this once in Standalone but haven't been able to reproduce it. (It will now manifest as a progress bar without a status message.) --- chrome/content/zotero/xpcom/zotero.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 49975001c..5df1d849c 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -1507,8 +1507,15 @@ Components.utils.import("resource://gre/modules/osfile.jsm"); let errors; let mode = automatic ? 'automatic' : 'manual'; + // This can seemingly fail due to a race condition building the Standalone window, + // so just ignore it if it does try { this.showZoteroPaneProgressMeter(Zotero.getString("dataDir.migration.inProgress")); + } + catch (e) { + Zotero.logError(e); + } + try { errors = yield Zotero.migrateDataDirectory(oldDir, newDir, partial, progressHandler); } catch (e) {