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

Don't explode when trying to list a broken localized pref.

Browse Source
This commit is contained in:
Kris Maglione
2013-04-20 20:53:01 -07:00
parent a9ff4b9083
commit cd8bb6915a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/modules/prefs.jsm
View File

@@ -111,10 +111,11 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
switch (type) {
case Ci.nsIPrefBranch.PREF_STRING:
let value = this.branch.getComplexValue(name, Ci.nsISupportsString).data;
// try in case it's a localized string (will throw an exception if not)
if (!this.branch.prefIsLocked(name) && !this.branch.prefHasUserValue(name) &&
RegExp("chrome://.+/locale/.+\\.properties").test(value))
value = this.branch.getComplexValue(name, Ci.nsIPrefLocalizedString).data;
try {
if (/^[a-z0-9-]+:/i.test(value))
value = this.branch.getComplexValue(name, Ci.nsIPrefLocalizedString).data;
}
catch (e) {}
return value;
case Ci.nsIPrefBranch.PREF_INT:
return this.branch.getIntPref(name);