mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Stillman 2016-11-12 22:06:40 -05:00
parent ce6a0ecb01
commit 62177e208d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/xpcom/zotero.js
View file

@ -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