summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-13 17:27:59 -0400
committerAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-13 17:27:59 -0400
commit40fc72376411587e7bf9985fb9545eca1c9aaa8e (patch)
treeac903ee86826040650a54f972d2557d0fb99f0a2
parent8757548a3e5b5cc4d159d61eb4a12c7af1be548e (diff)
downloadUXP-40fc72376411587e7bf9985fb9545eca1c9aaa8e.tar
UXP-40fc72376411587e7bf9985fb9545eca1c9aaa8e.tar.gz
UXP-40fc72376411587e7bf9985fb9545eca1c9aaa8e.tar.lz
UXP-40fc72376411587e7bf9985fb9545eca1c9aaa8e.tar.xz
UXP-40fc72376411587e7bf9985fb9545eca1c9aaa8e.zip
Pref try/catch block fixup. Tag #991.
-rw-r--r--devtools/client/framework/toolbox-process-window.js4
-rw-r--r--toolkit/components/search/current/nsSearchService.js13
-rw-r--r--toolkit/components/search/orginal/nsSearchService.js13
3 files changed, 18 insertions, 12 deletions
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index c34fe3355..8f75e3e24 100644
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -103,8 +103,8 @@ function openToolbox({ form, chrome, isTabActor }) {
// Remember the last panel that was used inside of this profile.
// But if we are testing, then it should always open the debugger panel.
let selectedTool =
- Services.prefs.getCharPref("devtools.toolbox.selectedTool",
- Services.prefs.getCharPref("devtools.browsertoolbox.panel",
+ Services.prefs.getCharPref("devtools.browsertoolbox.panel",
+ Services.prefs.getCharPref("devtools.toolbox.selectedTool",
"jsdebugger"));
let options = { customIframe: frame };
diff --git a/toolkit/components/search/current/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js
index 66866540a..db90e5150 100644
--- a/toolkit/components/search/current/nsSearchService.js
+++ b/toolkit/components/search/current/nsSearchService.js
@@ -983,11 +983,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) {
var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID",
Services.appinfo.distributionID || "");
- var official;
- if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL))
- official = "official";
- else
- official = "unofficial";
+ var official = MOZ_OFFICIAL;
+ try {
+ if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official"))
+ official = "official";
+ else
+ official = "unofficial";
+ }
+ catch (ex) { }
// Custom search parameters. These are only available to default search
// engines.
diff --git a/toolkit/components/search/orginal/nsSearchService.js b/toolkit/components/search/orginal/nsSearchService.js
index c4481df5f..1cec5f966 100644
--- a/toolkit/components/search/orginal/nsSearchService.js
+++ b/toolkit/components/search/orginal/nsSearchService.js
@@ -1024,11 +1024,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) {
var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID",
MOZ_DISTRIBUTION_ID || "");
- var official;
- if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL))
- official = "official";
- else
- official = "unofficial";
+ var official = MOZ_OFFICIAL;
+ try {
+ if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official"))
+ official = "official";
+ else
+ official = "unofficial";
+ }
+ catch (ex) { }
// Custom search parameters. These are only available to default search
// engines.