From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 devtools/client/definitions.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'devtools/client/definitions.js')

diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 70a7906160..e12c1c8dcc 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -161,7 +161,11 @@ Tools.inspector = {
   // that trigger the element picker.
   preventRaisingOnKey: true,
   onkey(panel, toolbox) {
-    toolbox.nodePicker.togglePicker();
+    if (
+      Services.prefs.getBoolPref("devtools.command-button-pick.enabled", false)
+    ) {
+      toolbox.nodePicker.togglePicker();
+    }
   },
 
   isToolSupported(toolbox) {
-- 
cgit v1.2.3