Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1243935 - "Restartless add-ons that get into the pending disable state never disable". r=aswan

Browse Source 
--HG--
extra : rebase_source : a932007d5b4bdad83fdf21c50776f55a928174c2
This commit is contained in:
Dave Townsend 2016-01-28 16:01:00 +01:00
parent ca74460c52
commit 6ec3a34a03
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -2695,10 +2695,18 @@ this.XPIProvider = {
let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
file.persistentDescriptor = XPIProvider.bootstrappedAddons[id].descriptor;
let addon = createAddonDetails(id, XPIProvider.bootstrappedAddons[id]);
XPIProvider.callBootstrapMethod(addon, file, "shutdown",
BOOTSTRAP_REASONS.APP_SHUTDOWN);
if (XPIProvider.bootstrappedAddons[id].disable)
delete XPIProvider.bootstrappedAddons[aId];
// If the add-on was pending disable then shut it down and remove it
// from the persisted data.
if (XPIProvider.bootstrappedAddons[id].disable) {
XPIProvider.callBootstrapMethod(addon, file, "shutdown",
BOOTSTRAP_REASONS.ADDON_DISABLE);
delete XPIProvider.bootstrappedAddons[id];
}
else {
XPIProvider.callBootstrapMethod(addon, file, "shutdown",
BOOTSTRAP_REASONS.APP_SHUTDOWN);
}
}
Services.obs.removeObserver(this, "quit-application-granted");
}