fix unregister hotkey not properly recognising single and combo of same key

Author: jjw24

ChefKeys/ChefKeysManager.cs

@@ -59,7 +59,7 @@ public static void RegisterHotkey(string hotkeys, string previousHotkey, Action<
             hotkeys = ConvertIncorrectKeyString(hotkeys);
             previousHotkey = ConvertIncorrectKeyString(previousHotkey);
 
-            UnregisterHotkey(hotkeys, previousHotkey, action);
+            UnregisterHotkey(previousHotkey);
 
             // The released key need to be the unique key in the dictionary.
             // The last key in the combo is the release key that triggers action
@@ -98,34 +98,29 @@ public static void RegisterHotkey(string hotkeys, string previousHotkey, Action<
             registeredHotkeys.Add(ToKeyCode(keys.First()), keyRecord);
         }
 
-        public static void UnregisterHotkey(string hotkey, string previousHotkey, Action<string> action)
+        public static void UnregisterHotkey(string hotkey)
         {
-            var hotkeyToCheck = hotkey;
-
-            if (!registeredHotkeys.TryGetValue(ToKeyCode(SplitHotkeyReversed(hotkeyToCheck).First()), out var existingKeyRecord))
-            {
-                hotkeyToCheck= previousHotkey;
-                if (!registeredHotkeys.TryGetValue(ToKeyCode(SplitHotkeyReversed(hotkeyToCheck).First()), out var existingPrevKeyRecord))
-                    return;
+            if (!registeredHotkeys.TryGetValue(ToKeyCode(SplitHotkeyReversed(hotkey).First()), out var existingKeyRecord))
+                return;
 
-                existingKeyRecord = existingPrevKeyRecord;
-            }
+            if (!existingKeyRecord.KeyComboRecords.Exists(x => x.comboRaw == hotkey))
+                return;
 
-            if (existingKeyRecord.isSingleKeyRegistered && !existingKeyRecord.AreKeyCombosRegistered() && !hotkeyToCheck.Contains('+'))
+            if (!hotkey.Contains('+'))
             {
                 existingKeyRecord.action -= existingKeyRecord.action;
-                registeredHotkeys.Remove(existingKeyRecord.vk_code);
-                return;
-            }
+                existingKeyRecord.isSingleKeyRegistered = false;
 
-            var comboRecord = existingKeyRecord.KeyComboRecords.FirstOrDefault(x => x.comboRaw == hotkeyToCheck);
+                if (!existingKeyRecord.AreKeyCombosRegistered())
+                    registeredHotkeys.Remove(existingKeyRecord.vk_code);
 
-            // There is a single key press still registered, no need to remove anything from registeredHotkeys.
-            if (comboRecord is null)
                 return;
+            }
 
+            var comboRecord = existingKeyRecord.KeyComboRecords.FirstOrDefault(x => x.comboRaw == hotkey);
             comboRecord.action -= comboRecord.action;
-            existingKeyRecord.KeyComboRecords.RemoveAll(x => x.comboRaw == hotkeyToCheck);
+            existingKeyRecord.KeyComboRecords.RemoveAll(x => x.comboRaw == hotkey);
+            
             if (!existingKeyRecord.isSingleKeyRegistered && !existingKeyRecord.AreKeyCombosRegistered())
                 registeredHotkeys.Remove(existingKeyRecord.vk_code);
         }
@@ -201,7 +196,7 @@ private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
                 if (blockKeyPress)
                     return (IntPtr)1;
             }
-            
+
             return CallNextHookEx(_hookID, nCode, wParam, lParam);
         }
 
@@ -232,7 +227,6 @@ private static bool HandleRegisteredKeyPress(IntPtr wParam, int vkCode, KeyRecor
                             break;
                         }
                     }
-                        
 
                     if (triggerCombo)
                     {
@@ -257,7 +251,7 @@ private static bool HandleRegisteredKeyPress(IntPtr wParam, int vkCode, KeyRecor
                         isLWinKeyDown = false;
                         SendAltKeyUp();
 
-                        keyRecord.action?.Invoke("LWin key remapped");
+                        keyRecord.action?.Invoke("");
 
                         return true;
                     }