The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-29 04:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

Browse Source
This commit is contained in:
mika-n 2020-01-04 21:13:36 +02:00
commit 2476a3482d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DS4Windows/DS4Forms/ViewModels/RecordBoxViewModel.cs
View File

@ -308,22 +308,21 @@ namespace DS4WinWPF.DS4Forms.ViewModels
continue; 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)) if (!isdown && Mapping.getBoolMapping(0, dc, cState, null, null))
{ {
int macroValue = Global.macroDS4Values[dc];
MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue], MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue],
MacroStep.StepType.ActDown, MacroStep.StepOutput.Button); MacroStep.StepType.ActDown, MacroStep.StepOutput.Button);
AddMacroStep(step); AddMacroStep(step);
keysdownMap.Add((int)dc, true); keysdownMap.Add(macroValue, true);
} }
else if (isdown && !Mapping.getBoolMapping(0, dc, cState, null, null)) else if (isdown && !Mapping.getBoolMapping(0, dc, cState, null, null))
{ {
int macroValue = Global.macroDS4Values[dc];
MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue], MacroStep step = new MacroStep(macroValue, MacroParser.macroInputNames[macroValue],
MacroStep.StepType.ActUp, MacroStep.StepOutput.Button); MacroStep.StepType.ActUp, MacroStep.StepOutput.Button);
AddMacroStep(step); AddMacroStep(step);
keysdownMap.Remove((int)dc); keysdownMap.Remove(macroValue);
} }
} }
} }