summaryrefslogtreecommitdiffstats
path: root/devtools/client/framework/toolbox-process-window.js
diff options
context:
space:
mode:
Diffstat (limited to 'devtools/client/framework/toolbox-process-window.js')
-rw-r--r--devtools/client/framework/toolbox-process-window.js17
1 files changed, 6 insertions, 11 deletions
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index 8ead718b3..8f75e3e24 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.browsertoolbox.panel",
+ Services.prefs.getCharPref("devtools.toolbox.selectedTool",
+ "jsdebugger"));
let options = { customIframe: frame };
gDevTools.showToolbox(target,