mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for lost legacy data directory after migration

Browse source 
The check only does anything if we're using the default location, and
otherwise if we migrate the wrong directory (say, because somebody
opened Standalone 4.0 before upgrading to 5.0) we won't prompt until the
next restart.
This commit is contained in:
Dan Stillman 2017-11-21 22:21:22 -05:00
parent 921b21c3e1
commit 4a6922ba48
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/zotero.js
View file

@ -391,17 +391,17 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
if (!Zotero.isConnector) {
if (!this.forceDataDir) {
yield Zotero.DataDirectory.checkForLostLegacy();
if (this.restarting) {
return;
}
yield Zotero.DataDirectory.checkForMigration(
dataDir, Zotero.DataDirectory.defaultDir
);
if (this.skipLoading) {
return;
}
yield Zotero.DataDirectory.checkForLostLegacy();
if (this.restarting) {
return;
}
}
// Make sure data directory isn't in Dropbox, etc.