gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-14 20:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of old rehash code and add timeout before nuking sandboxes. Closes issue #1130.

Browse Source
This commit is contained in:
Kris Maglione
2014-03-14 23:22:39 -07:00
parent cb11523659
commit 7f91a7eb7f
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/modules/util.jsm
View File

@@ -1173,26 +1173,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
util.dump("cleanup: " + module.constructor.className);
util.trapErrors(module.cleanup, module, reason);
}
if (!this.rehashing)
services.observer.addObserver(this, "dactyl-rehash", true);
},
"dactyl-rehash": function dactylRehash() {
services.observer.removeObserver(this, "dactyl-rehash");
defineModule.loadLog.push("dactyl: util: observe: dactyl-rehash");
if (!this.rehashing)
for (let module in values(defineModule.modules)) {
defineModule.loadLog.push("dactyl: util: init(" + module + ")");
if (module.reinit)
module.reinit();
else
module.init();
}
},
"dactyl-purge": function dactylPurge() {
this.rehashing = 1;
},
}
},
/**
@@ -1371,7 +1352,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
this.timeout(function () {
this.flushCache();
cache.flush(bind("test", /^literal:/));
this.rehashing = true;
let addon = config.addon;
addon.userDisabled = true;
addon.userDisabled = false;