From 609a7215e6ef705fd098fd4adb4f922795ff1119 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Mon, 8 Apr 2019 20:05:53 -0400
Subject: Issue #991 Part 3: Devtools

---
 devtools/client/framework/devtools.js               |  7 +------
 devtools/client/framework/toolbox-process-window.js | 17 ++++++-----------
 devtools/client/framework/toolbox.js                |  7 +------
 3 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'devtools/client/framework')

diff --git a/devtools/client/framework/devtools.js b/devtools/client/framework/devtools.js
index 90f88023b..976a4b56d 100644
--- a/devtools/client/framework/devtools.js
+++ b/devtools/client/framework/devtools.js
@@ -195,12 +195,7 @@ DevTools.prototype = {
       return tool;
     }
 
-    let enabled;
-    try {
-      enabled = Services.prefs.getBoolPref(tool.visibilityswitch);
-    } catch (e) {
-      enabled = true;
-    }
+    let enabled = Services.prefs.getBoolPref(tool.visibilityswitch, true);
 
     return enabled ? tool : null;
   },
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index 8ead718b3..c34fe3355 100644
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -100,17 +100,12 @@ function openToolbox({ form, chrome, isTabActor }) {
   };
   TargetFactory.forRemoteTab(options).then(target => {
     let frame = document.getElementById("toolbox-iframe");
-    let selectedTool = "jsdebugger";
-
-    try {
-      // Remember the last panel that was used inside of this profile.
-      selectedTool = Services.prefs.getCharPref("devtools.toolbox.selectedTool");
-    } catch(e) {}
-
-    try {
-      // But if we are testing, then it should always open the debugger panel.
-      selectedTool = Services.prefs.getCharPref("devtools.browsertoolbox.panel");
-    } catch(e) {}
+    // 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",
+                                                            "jsdebugger"));
 
     let options = { customIframe: frame };
     gDevTools.showToolbox(target,
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 926e30647..cde7de0e4 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -1131,12 +1131,7 @@ Toolbox.prototype = {
   setToolboxButtonsVisibility: function () {
     this.toolboxButtons.forEach(buttonSpec => {
       let { visibilityswitch, button, isTargetSupported } = buttonSpec;
-      let on = true;
-      try {
-        on = Services.prefs.getBoolPref(visibilityswitch);
-      } catch (ex) {
-        // Do nothing.
-      }
+      let on = Services.prefs.getBoolPref(visibilityswitch, true);
 
       on = on && isTargetSupported(this.target);
 
-- 
cgit v1.2.3


From 40fc72376411587e7bf9985fb9545eca1c9aaa8e Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sat, 13 Apr 2019 17:27:59 -0400
Subject: Pref try/catch block fixup. Tag #991.

---
 devtools/client/framework/toolbox-process-window.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'devtools/client/framework')

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 };
-- 
cgit v1.2.3