From 7a79dc569aa0755af1b3adf92b80ee538ef0cb57 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sat, 4 Jan 2020 13:01:05 -0600 Subject: [PATCH] Make sure to use proper macro values for controller button presses Related to issue #1002 --- DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs b/DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs index b248781..f2a038e 100644 --- a/DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs +++ b/DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs @@ -308,22 +308,21 @@ namespace DS4WinWPF.DS4Forms.ViewModels continue; } - keysdownMap.TryGetValue((int)dc, out bool isdown); + int macroValue = Global.macroDS4Values[dc]; + keysdownMap.TryGetValue(macroValue, out bool isdown); if (!isdown && Mapping.getBoolMapping(0, dc, cState, null, null)) { - int macroValue = Global.macroDS4Values[dc]; MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue], MacroStep.StepType.ActDown, MacroStep.StepOutput.Button); AddMacroStep(step); - keysdownMap.Add((int)dc, true); + keysdownMap.Add(macroValue, true); } else if (isdown && !Mapping.getBoolMapping(0, dc, cState, null, null)) { - int macroValue = Global.macroDS4Values[dc]; MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue], MacroStep.StepType.ActUp, MacroStep.StepOutput.Button); AddMacroStep(step); - keysdownMap.Remove((int)dc); + keysdownMap.Remove(macroValue); } } }