www

commit 62177e208d770dd8dd4b556727a02966dae06e20
parent ce6a0ecb01790777461ed9a4c69312dc7c1b75ed
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat, 12 Nov 2016 22:06:40 -0500

Check DB lock before checking for restore-from-server marker

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

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -446,6 +446,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	 * @return {Promise:Boolean}
 	 */
 	var _initFull = Zotero.Promise.coroutine(function* () {
+		if (!(yield _initDB())) return false;
+		
 		Zotero.VersionHeader.init();
 		
 		// Check for data reset/restore
@@ -490,8 +492,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			}
 		}
 		
-		if(!(yield _initDB())) return false;
-		
 		Zotero.HTTP.triggerProxyAuth();
 		
 		// Add notifier queue callbacks to the DB layer