From 3e641cd7df68d6434bc8bcbdc66f47fc4a511e17 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 24 Aug 2011 00:54:38 +0000
Subject: [PATCH] Fix first run profile migration on Windows

---
 chrome/content/zotero/xpcom/zotero.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index fcce0be1b..20fba801f 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -852,8 +852,8 @@ if(appInfo.platformVersion[0] >= 2) {
 		
 		
 		if(defaultSection.IsRelative) {
-			var defaultProfile = prefDir.clone();
-			[defaultProfile.append(dir) for each(dir in defaultSection.Path.split("/"))];
+			var defaultProfile = prefDir.clone().QueryInterface(Components.interfaces.nsILocalFile);
+			defaultProfile.appendRelativePath(defaultSection.Path);
 		} else {
 			var defaultProfile = Components.classes["@mozilla.org/file/local;1"]
 				.createInstance(Components.interfaces.nsILocalFile);
@@ -924,7 +924,15 @@ if(appInfo.platformVersion[0] >= 2) {
 				Zotero.debug("Looking for existing profile in "+prefDir.path);
 				
 				// 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) {
 					// get Zotero directory
 					var zoteroDir = defProfile[0].clone();