www

commit 8383c5cda891bd1e7699c5763b129c0ed2b7dfa5
parent c2033ef5a1e0ac3dd6d3d068fb5645d362956712
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 22 Nov 2016 03:32:16 -0500

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.)

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git 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) {