From b0fd7adcbe9caa7b1ff41b7c7e59c42431bbb232 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 27 May 2020 23:45:26 -0400
Subject: [PATCH] Ignore useDataDir pref if no dataDir pref

---
 chrome/content/zotero/xpcom/dataDirectory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js
index 8fd02f7c39..5bca15411f 100644
--- a/chrome/content/zotero/xpcom/dataDirectory.js
+++ b/chrome/content/zotero/xpcom/dataDirectory.js
@@ -86,7 +86,7 @@ Zotero.DataDirectory = {
 				dataDir = dir;
 			}
 		}
-		else if (Zotero.Prefs.get('useDataDir')) {
+		else if (Zotero.Prefs.get('useDataDir') && Zotero.Prefs.get('dataDir')) {
 			let prefVal = Zotero.Prefs.get('dataDir');
 			// Convert old persistent descriptor pref to string path and clear obsolete lastDataDir pref
 			//