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

Try harder to prevent sync-in-progress messages

Browse source
This commit is contained in:
Dan Stillman 2017-07-11 02:42:00 -04:00
parent c701f34aaa
commit fd7c2a6f6f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/sync/syncRunner.js
View file

@ -119,12 +119,12 @@ Zotero.Sync.Runner_Module = function (options = {}) {
_syncInProgress = true;
_stopping = false;
yield Zotero.Notifier.trigger('start', 'sync', []);
// Purge deleted objects so they don't cause sync errors (e.g., long tags)
yield Zotero.purgeDataObjects(true);
try {
yield Zotero.Notifier.trigger('start', 'sync', []);
// Purge deleted objects so they don't cause sync errors (e.g., long tags)
yield Zotero.purgeDataObjects(true);
let apiKey = yield _getAPIKey();
if (!apiKey) {
throw new Zotero.Error("API key not set", Zotero.Error.ERROR_API_KEY_NOT_SET);
@ -801,12 +801,12 @@ Zotero.Sync.Runner_Module = function (options = {}) {
this.end = Zotero.Promise.coroutine(function* (options) {
_syncInProgress = false;
yield this.checkErrors(_errors, options);
if (!options.restartSync) {
this.updateIcons(_errors);
}
_errors = [];
_syncInProgress = false;
});