Ticket #3495: t3495_fix_hotkey_combos_v1.patch

source/ps/Hotkey.cpp

@@ -125 +125 @@
             bool allNegated = true;
 
             for (const SKey& k : hotkey.requires)
                 if (!k.negated)
                     allNegated = false;
-            
+
             if (allNegated)
                 g_HotkeyStatus[hotkey.name] = true;
         }
 }
 
@@ -297 +297 @@
             continue;
 
         // Check for no unpermitted keys
         bool accept = true;
         for (const SKey& k : hotkey.requires)
+        {
             accept = isNegated(k);
+            if (!accept)
+                break;
+        }
 
         if (accept && !(consoleCapture && hotkey.name != "console.toggle"))
         {
             // Check if this is an equally precise or more precise match
             if (hotkey.requires.size() + 1 >= closestMapMatch)
@@ -339 +343 @@
             continue;
 
         // Check for no unpermitted keys
         bool accept = true;
         for (const SKey& k : hotkey.requires)
+        {
             accept = isNegated(k);
+            if (!accept)
+                break;
+        }
 
         if (accept)
         {
             SDL_Event_ hotkeyNotification;
             hotkeyNotification.ev.type = SDL_HOTKEYUP;