piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
MappingCommon: Fix detection of hotkey and conjunction expressions.
This commit is contained in:
JMC47
2022-03-19 00:41:00 -04:00
committed by GitHub
parent f73b2d70a6 b589d720bf
commit edd63d8c3f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
View File

@ -107,17 +107,19 @@ BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection>
for (auto& detection : detections) for (auto& detection : detections)
{ {
// Remove since released inputs. // Remove since-released inputs.
for (auto it = pressed_inputs.begin(); it != pressed_inputs.end();) 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(); handle_release();
it = pressed_inputs.erase(it); it = pressed_inputs.erase(it);
} }
else else
{
++it; ++it;
} }
}
handle_press(detection); handle_press(detection);
} }