From bc3386ff9d55e2f4412c2ccd3236c7510aac0d59 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 16 Nov 2016 09:49:43 -0500
Subject: [PATCH] Tweak existing data directory detection

Fixes some issues after f2163b3433
---
 chrome/content/zotero/xpcom/zotero.js | 67 ++++++++++++++-------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index ac1e596270..cbfd41e3bc 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -1080,46 +1080,47 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			if(defProfile) {
 				// get Zotero directory
 				let profileDir = defProfile[0].path;
-				let zoteroDir = OS.Path.join(profileDir, ZOTERO_CONFIG.ID);
+				Zotero.debug("Found default profile at " + profileDir);
 				
-				// if Zotero directory exists in default profile for alternative app, use it
-				if (Zotero.File.pathToFile(zoteroDir).exists()) {
-					let multipleProfiles = defProfile[1];
+				// copy prefs
+				let prefsFile = OS.Path.join(profileDir, "prefs.js");
+				if (Zotero.File.pathToFile(prefsFile).exists()) {
+					// build sandbox
+					var sandbox = new Components.utils.Sandbox("http://www.example.com/");
+					Components.utils.evalInSandbox(
+						"var prefs = {};"+
+						"function user_pref(key, val) {"+
+							"prefs[key] = val;"+
+						"}"
+					, sandbox);
 					
-					// copy prefs
-					let prefsFile = OS.Path.join(profileDir, "prefs.js");
-					if (Zotero.File.pathToFile(prefsFile).exists()) {
-						// build sandbox
-						var sandbox = new Components.utils.Sandbox("http://www.example.com/");
-						Components.utils.evalInSandbox(
-							"var prefs = {};"+
-							"function user_pref(key, val) {"+
-								"prefs[key] = val;"+
-							"}"
-						, sandbox);
-						
-						// remove comments
-						var prefsJs = Zotero.File.getContents(prefsFile);
-						prefsJs = prefsJs.replace(/^#[^\r\n]*$/mg, "");
-						
-						// evaluate
-						Components.utils.evalInSandbox(prefsJs, sandbox);
-						var prefs = sandbox.prefs;
-						for(var key in prefs) {
-							if(key.substr(0, ZOTERO_CONFIG.PREF_BRANCH.length) === ZOTERO_CONFIG.PREF_BRANCH
-									&& key !== "extensions.zotero.firstRun2") {
-								Zotero.Prefs.set(key.substr(ZOTERO_CONFIG.PREF_BRANCH.length), prefs[key]);
-							}
+					// remove comments
+					var prefsJs = Zotero.File.getContents(prefsFile);
+					prefsJs = prefsJs.replace(/^#[^\r\n]*$/mg, "");
+					
+					// evaluate
+					Components.utils.evalInSandbox(prefsJs, sandbox);
+					var prefs = sandbox.prefs;
+					for(var key in prefs) {
+						if(key.substr(0, ZOTERO_CONFIG.PREF_BRANCH.length) === ZOTERO_CONFIG.PREF_BRANCH
+								&& key !== "extensions.zotero.firstRun2") {
+							Zotero.Prefs.set(key.substr(ZOTERO_CONFIG.PREF_BRANCH.length), prefs[key]);
 						}
 					}
 					
-					// also set data dir if no custom data dir is now defined
-					if(!Zotero.Prefs.get("useDataDir")) {
-						this.setDataDirectory(zoteroDir);
+					// If data directory setting was transferred, use that
+					if (Zotero.Prefs.get('useDataDir')) {
+						return this.getZoteroDirectory();
 					}
-					
-					file = Zotero.File.pathToFile(zoteroDir);
 				}
+				
+				// If a custom data directory isn't now defined and there's a data directory in the
+				// default profile for the alternative app, use that
+				let zoteroDir = OS.Path.join(profileDir, ZOTERO_CONFIG.ID);
+				if (!Zotero.Prefs.get("useDataDir") && Zotero.File.pathToFile(profileDir).exists()) {
+					this.setDataDirectory(zoteroDir);
+				}
+				file = Zotero.File.pathToFile(zoteroDir);
 			}
 			
 			Zotero.File.createDirectoryIfMissing(file);