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

Fix data directory migration if only Firefox profile directory

Browse Source
This commit is contained in:
Dan Stillman 2017-08-19 15:58:42 +02:00
parent bbfe4b92de
commit d368c4019a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/xpcom/dataDirectory.js
View File

@ -229,7 +229,7 @@ Zotero.DataDirectory = {
let mtime = (yield OS.File.stat(dbFile)).lastModificationDate; let mtime = (yield OS.File.stat(dbFile)).lastModificationDate;
Zotero.debug(`Database found at ${dbFile}, last modified ${mtime}`); Zotero.debug(`Database found at ${dbFile}, last modified ${mtime}`);
// If custom location has a newer DB, use that // If custom location has a newer DB, use that
if (useProfile && mtime > profileSubdirModTime) { if (!useProfile || mtime > profileSubdirModTime) {
dataDir = nsIFile.path; dataDir = nsIFile.path;
useFirefoxProfileCustom = true; useFirefoxProfileCustom = true;
useProfile = false; useProfile = false;
@ -254,7 +254,7 @@ Zotero.DataDirectory = {
let mtime = (yield OS.File.stat(dbFile)).lastModificationDate; let mtime = (yield OS.File.stat(dbFile)).lastModificationDate;
Zotero.debug(`Database found at ${dbFile}, last modified ${mtime}`); Zotero.debug(`Database found at ${dbFile}, last modified ${mtime}`);
// If newer than Zotero profile directory, use this one // If newer than Zotero profile directory, use this one
if (useProfile && mtime > profileSubdirModTime) { if (!useProfile || mtime > profileSubdirModTime) {
dataDir = dir; dataDir = dir;
useFirefoxProfile = true; useFirefoxProfile = true;
useProfile = false; useProfile = false;