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

Fix logged error when changing data directory

Browse source
This commit is contained in:
Dan Stillman 2024-04-05 07:39:06 -04:00
parent 1201cc5eb6
commit c6256402e4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/dataDirectory.js
View file

@ -444,15 +444,20 @@ Zotero.DataDirectory = {
}, },
/**
* @return {String|false} - New path or false if not changed
*/
choose: async function (forceQuitNow, useHomeDir, moreInfoCallback) { choose: async function (forceQuitNow, useHomeDir, moreInfoCallback) {
var win = Services.wm.getMostRecentWindow('navigator:browser'); var win = Services.wm.getMostRecentWindow('navigator:browser');
var ps = Services.prompt; var ps = Services.prompt;
var newPath;
if (useHomeDir) { if (useHomeDir) {
let changed = this.set(this.defaultDir); let changed = this.set(this.defaultDir);
if (!changed) { if (!changed) {
return false; return false;
} }
newPath = this.defaultDir;
} }
else { else {
while (true) { while (true) {
@ -548,6 +553,7 @@ Zotero.DataDirectory = {
} }
this.set(file.path); this.set(file.path);
newPath = file.path;
break; break;
} }
@ -575,7 +581,7 @@ Zotero.DataDirectory = {
Services.startup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit); Services.startup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
} }
return useHomeDir ? true : file; return newPath;
}, },