suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore failure trying to show data dir migration status message

Browse Source 
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.)
This commit is contained in:
Dan Stillman 2016-11-22 03:32:16 -05:00
parent c2033ef5a1
commit 8383c5cda8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/zotero.js
View File

@ -1507,8 +1507,15 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
let errors; let errors;
let mode = automatic ? 'automatic' : 'manual'; 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 { try {
this.showZoteroPaneProgressMeter(Zotero.getString("dataDir.migration.inProgress")); this.showZoteroPaneProgressMeter(Zotero.getString("dataDir.migration.inProgress"));
}
catch (e) {
Zotero.logError(e);
}
try {
errors = yield Zotero.migrateDataDirectory(oldDir, newDir, partial, progressHandler); errors = yield Zotero.migrateDataDirectory(oldDir, newDir, partial, progressHandler);
} }
catch (e) { catch (e) {