gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 23:45:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix config.addon race and add guards against future breakage.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-30 14:45:33 -05:00
parent 71ae0ca0cd
commit bff31e153d
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/modules/config.jsm
View File

@@ -53,7 +53,15 @@ var ConfigBase = Class("ConfigBase", {
get addonID() this.name + "@dactyl.googlecode.com",
addon: Class.memoize(function () {
let addon = services.fuel.storage.get("dactyl.bootstrap", {}).addon;
let addon;
util.waitFor(function () {
addon = services.fuel.storage.get("dactyl.bootstrap", {}).addon;
if (addon && !addon.getResourceURI)
util.reportError(Error("Don't have add-on yet"));
return !addon || addon.getResourceURI();
});
if (!addon)
addon = require("addons").AddonManager.getAddonByID(this.addonID);
return addon;