Merge pull request #10519 from jordan-woyak/fix-hotkey-detections

MappingCommon: Fix detection of hotkey and conjunction expressions.
dolphin-emu · Mar 19, 2022 · edd63d8 · edd63d8
2 parents f73b2d7 + b589d72
commit edd63d8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
@@ -107,16 +107,18 @@ BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection>
 
   for (auto& detection : detections)
   {
-    // Remove since released inputs.
+    // Remove since-released inputs.
     for (auto it = pressed_inputs.begin(); it != pressed_inputs.end();)
     {
-      if (!((*it)->release_time > detection.press_time))
+      if ((*it)->release_time && (*it)->release_time <= detection.press_time)
       {
         handle_release();
         it = pressed_inputs.erase(it);
       }
       else
+      {
         ++it;
+      }
     }
 
     handle_press(detection);