Do not register dialog jump hotkey when dialog jump is disabled

Author: Jack251970

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -531,7 +531,19 @@ public CustomBrowserViewModel CustomBrowser
             }
         };
 
-        public bool EnableDialogJump { get; set; } = true;
+        private bool _enableDialogJump = true;
+        public bool EnableDialogJump
+        {
+            get => _enableDialogJump;
+            set
+            {
+                if (_enableDialogJump != value)
+                {
+                    _enableDialogJump = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         public bool AutoDialogJump { get; set; } = false;
 

Flow.Launcher/Helper/HotKeyMapper.cs

@@ -139,6 +139,11 @@ private static void InitializeRegisteredHotkeys()
         foreach (var hotkey in list)
         {
             _settings.RegisteredHotkeys.Add(hotkey);
+            if (hotkey.RegisteredType == RegisteredHotkeyType.DialogJump && !_settings.EnableDialogJump)
+            {
+                // If dialog jump is disabled, do not register the hotkey
+                continue;
+            }
             SetHotkey(hotkey);
         }
 
@@ -158,7 +163,10 @@ private static void Settings_PropertyChanged(object sender, PropertyChangedEvent
                 ChangeRegisteredHotkey(RegisteredHotkeyType.Toggle, _settings.Hotkey);
                 break;
             case nameof(_settings.DialogJumpHotkey):
-                ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey);
+                ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey, _settings.EnableDialogJump);
+                break;
+            case nameof(_settings.EnableDialogJump):
+                ChangeRegisteredHotkey(RegisteredHotkeyType.DialogJump, _settings.DialogJumpHotkey, _settings.EnableDialogJump);
                 break;
 
             // Flow Launcher window hotkeys
@@ -592,22 +600,19 @@ kb.Gesture is KeyGesture keyGesture1 &&
 
     #region Hotkey Changing
 
-    private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr)
+    private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr, bool setHotkey = true)
     {
         var newHotkey = new HotkeyModel(newHotkeyStr);
-        ChangeRegisteredHotkey(registeredType, newHotkey);
+        ChangeRegisteredHotkey(registeredType, newHotkey, setHotkey);
     }
 
-    private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey)
+    private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey, bool setHotkey = true)
     {
         // Find the old registered hotkey data item
         var registeredHotkeyData = _settings.RegisteredHotkeys.FirstOrDefault(h => h.RegisteredType == registeredType);
 
         // If it is not found, return
-        if (registeredHotkeyData == null)
-        {
-            return;
-        }
+        if (registeredHotkeyData == null) return;
 
         // Remove the old hotkey
         RemoveHotkey(registeredHotkeyData);
@@ -616,7 +621,10 @@ private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType,
         registeredHotkeyData.SetHotkey(newHotkey);
 
         // Set the new hotkey
-        SetHotkey(registeredHotkeyData);
+        if (setHotkey)
+        {
+            SetHotkey(registeredHotkeyData);
+        }
     }
 
     #endregion