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

Bug 1017706 - Make sure that healthreporter.jsm always initiates shutdown, even if it never receives quit-application. r=gps

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2014-06-09 12:07:00 -04:00
parent e80860fc4d
commit cf4ce277ba
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/healthreport/healthreporter.jsm
View File

@ -402,7 +402,15 @@ AbstractHealthReporter.prototype = Object.freeze({
// The database needs to be shut down by the end of shutdown // The database needs to be shut down by the end of shutdown
// phase profileBeforeChange. // phase profileBeforeChange.
Metrics.Storage.shutdown.addBlocker("FHR: Flushing storage shutdown", Metrics.Storage.shutdown.addBlocker("FHR: Flushing storage shutdown",
this._promiseShutdown, () => {
// Workaround bug 1017706
// Apparently, in some cases, quit-application is not triggered
// (or is triggered after profile-before-change), so we need to
// make sure that `_initiateShutdown()` is triggered at least
// once.
this._initiateShutdown();
return this._promiseShutdown;
},
() => ({ () => ({
shutdownInitiated: this._shutdownInitiated, shutdownInitiated: this._shutdownInitiated,
initialized: this._initialized, initialized: this._initialized,
@ -412,7 +420,7 @@ AbstractHealthReporter.prototype = Object.freeze({
storageInProgress: this._storageInProgress, storageInProgress: this._storageInProgress,
hasProviderManager: !!this._providerManager, hasProviderManager: !!this._providerManager,
hasStorage: !!this._storage, hasStorage: !!this._storage,
shutdownComplete: this.shutdownComplete shutdownComplete: this._shutdownComplete
})); }));
try { try {