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

Fix first run profile migration on Windows

Browse source
This commit is contained in:
Simon Kornblith 2011-08-24 00:54:38 +00:00
parent b5735f5189
commit 3e641cd7df
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -852,8 +852,8 @@ if(appInfo.platformVersion[0] >= 2) {
if(defaultSection.IsRelative) { if(defaultSection.IsRelative) {
var defaultProfile = prefDir.clone(); var defaultProfile = prefDir.clone().QueryInterface(Components.interfaces.nsILocalFile);
[defaultProfile.append(dir) for each(dir in defaultSection.Path.split("/"))]; defaultProfile.appendRelativePath(defaultSection.Path);
} else { } else {
var defaultProfile = Components.classes["@mozilla.org/file/local;1"] var defaultProfile = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
@ -924,7 +924,15 @@ if(appInfo.platformVersion[0] >= 2) {
Zotero.debug("Looking for existing profile in "+prefDir.path); Zotero.debug("Looking for existing profile in "+prefDir.path);
// get default profile // get default profile
var defProfile = getDefaultProfile(prefDir); var defProfile;
try {
defProfile = getDefaultProfile(prefDir);
} catch(e) {
Zotero.debug("An error occurred locating the Firefox profile; not "+
"attempting to migrate from Zotero for Firefox");
Zotero.logError(e);
}
if(defProfile) { if(defProfile) {
// get Zotero directory // get Zotero directory
var zoteroDir = defProfile[0].clone(); var zoteroDir = defProfile[0].clone();