www

commit 4a6922ba48895ce9af759ae0a4d9d80ef1741dc9
parent 921b21c3e161a0c60946bd7c47b5113ee109ba54
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 21 Nov 2017 22:21:22 -0500

Check for lost legacy data directory after migration

The check only does anything if we're using the default location, and
otherwise if we migrate the wrong directory (say, because somebody
opened Standalone 4.0 before upgrading to 5.0) we won't prompt until the
next restart.

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -391,17 +391,17 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 		
 		if (!Zotero.isConnector) {
 			if (!this.forceDataDir) {
-				yield Zotero.DataDirectory.checkForLostLegacy();
-				if (this.restarting) {
-					return;
-				}
-				
 				yield Zotero.DataDirectory.checkForMigration(
 					dataDir, Zotero.DataDirectory.defaultDir
 				);
 				if (this.skipLoading) {
 					return;
 				}
+				
+				yield Zotero.DataDirectory.checkForLostLegacy();
+				if (this.restarting) {
+					return;
+				}
 			}
 			
 			// Make sure data directory isn't in Dropbox, etc.