wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correctly cancel any sync triggers after starting a sync with a shared function that removes timers and idle observers.

Browse Source
This commit is contained in:
Edward Lee 2009-09-24 19:04:06 -07:00
parent 51761d2ab6
commit 2ca32ed22d
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
services/sync/modules/service.js
View File

@ -985,6 +985,23 @@ WeaveSvc.prototype = {
return reason;
},
/**
* Remove any timers/observers that might trigger a sync
*/
_clearSyncTriggers: function _clearSyncTriggers() {
// Clear out any scheduled syncs
if (this._syncTimer) {
this._syncTimer.cancel();
this._syncTimer = null;
}
// Clear out a sync that's just waiting for idle if we happen to have one
try {
Svc.Idle.removeIdleObserver(this, IDLE_TIME);
}
catch(ex) {}
},
/**
* Check if we should be syncing and schedule the next sync, if it's not scheduled
*/
@ -993,15 +1010,7 @@ WeaveSvc.prototype = {
// if we're in backoff, we'll schedule the next sync
let reason = this._checkSync();
if (reason && reason != kSyncBackoffNotMet) {
if (this._syncTimer) {
this._syncTimer.cancel();
this._syncTimer = null;
}
try {
Svc.Idle.removeIdleObserver(this, IDLE_TIME);
} catch(e) {} // this throws if there isn't an observer, but that's fine
this._clearSyncTriggers();
this.status.service = STATUS_DISABLED;
return;
}
@ -1093,10 +1102,8 @@ WeaveSvc.prototype = {
throw reason;
}
if (this._autoConnectTimer) {
this._autoConnectTimer.cancel();
this._autoConnectTimer = null;
}
// Clear out any potentially pending syncs now that we're syncing
this._clearSyncTriggers();
if (!(this._remoteSetup()))
throw "aborting sync, remote setup failed";