From 982719bf83bb170297259a9cb0a66d64528d58f6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 7 Oct 2017 03:44:12 -0400
Subject: [PATCH] Fix data-dir-not-found error on first run with no legacy
 dataDir

---
 chrome/content/zotero/xpcom/dataDirectory.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/dataDirectory.js b/chrome/content/zotero/xpcom/dataDirectory.js
index d080d22448..ce4d556d51 100644
--- a/chrome/content/zotero/xpcom/dataDirectory.js
+++ b/chrome/content/zotero/xpcom/dataDirectory.js
@@ -322,11 +322,11 @@ Zotero.DataDirectory = {
 								useProfile = false;
 							}
 						}
+						// Legacy subdirectory doesn't exist or there was a problem accessing it, so
+						// just fall through to default location
 						catch (e) {
-							Zotero.logError(e);
-							// Same as above -- throw error if we don't already have a DB
-							if (!useProfile) {
-								throw e;
+							if (!(e instanceof OS.File.Error && e.becauseNoSuchFile)) {
+								Zotero.logError(e);
 							}
 						}
 					}