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

Fix delay-generator handling during upgrade check and full sync

Browse source
This commit is contained in:
Dan Stillman 2016-08-14 17:21:08 -04:00
parent 976b5c82c6
commit 03ef4723f8
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/sync/syncEngine.js
View file

@ -1210,7 +1210,7 @@ Zotero.Sync.Data.Engine.prototype._upgradeCheck = Zotero.Promise.coroutine(funct
+ allResults.libraryVersion + " != " + allResults.libraryVersion + " != "
+ sinceResults.libraryVersion + " != " + sinceResults.libraryVersion + " != "
+ lastLibraryVersion + ") -- waiting"); + lastLibraryVersion + ") -- waiting");
let keepGoing = yield gen.next(); let keepGoing = yield gen.next().value;
if (!keepGoing) { if (!keepGoing) {
throw new Error("Could not update " + this.library.name + " -- library in use"); throw new Error("Could not update " + this.library.name + " -- library in use");
} }
@ -1336,7 +1336,7 @@ Zotero.Sync.Data.Engine.prototype._fullSync = Zotero.Promise.coroutine(function*
Zotero.Sync.Data.conflictDelayIntervals, 60 * 60 * 1000 Zotero.Sync.Data.conflictDelayIntervals, 60 * 60 * 1000
); );
} }
let keepGoing = yield gen.next(); let keepGoing = yield gen.next().value;
if (!keepGoing) { if (!keepGoing) {
throw new Error("Could not update " + this.library.name + " -- library in use"); throw new Error("Could not update " + this.library.name + " -- library in use");
} }