Fixes #1719, Autosync suspension needs to persist
Don't auto-sync on Zotero pane open if a manual sync is required
This commit is contained in:
parent
0e45473992
commit
c0091db15e
|
@ -434,9 +434,14 @@ var ZoteroPane = new function()
|
||||||
// Auto-sync on pane open
|
// Auto-sync on pane open
|
||||||
if (Zotero.Prefs.get('sync.autoSync') && Zotero.Sync.Server.enabled
|
if (Zotero.Prefs.get('sync.autoSync') && Zotero.Sync.Server.enabled
|
||||||
&& !Zotero.Sync.Server.syncInProgress && !Zotero.Sync.Storage.syncInProgress) {
|
&& !Zotero.Sync.Server.syncInProgress && !Zotero.Sync.Storage.syncInProgress) {
|
||||||
setTimeout(function () {
|
if (Zotero.Sync.Server.manualSyncRequired) {
|
||||||
Zotero.Sync.Runner.sync(true);
|
Zotero.debug('Manual sync required -- skipping auto-sync', 4);
|
||||||
}, 1000);
|
}
|
||||||
|
else {
|
||||||
|
setTimeout(function () {
|
||||||
|
Zotero.Sync.Runner.sync(true);
|
||||||
|
}, 1000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user