The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-17 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only use one instance of field mapping in case of multiple multi-action button assignments

Browse Source
This commit is contained in:
Travis Nickles 2017-05-08 20:06:48 -07:00
parent 22ebca3e01
commit 74aa709583
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DS4Windows/DS4Control/Mapping.cs
View File

@ -1376,6 +1376,7 @@ namespace DS4Windows
{ {
int actionDoneCount = actionDone.Count; int actionDoneCount = actionDone.Count;
int totalActionCount = GetActions().Count; int totalActionCount = GetActions().Count;
DS4StateFieldMapping previousFieldMapping = null;
List<string> profileActions = getProfileActions(device); List<string> profileActions = getProfileActions(device);
//foreach (string actionname in profileActions) //foreach (string actionname in profileActions)
for (int actionIndex = 0, profileListLen = profileActions.Count; for (int actionIndex = 0, profileListLen = profileActions.Count;
@ -1722,9 +1723,15 @@ namespace DS4Windows
//cus //cus
DS4State tempPrevState = d.getPreviousState(); DS4State tempPrevState = d.getPreviousState();
DS4StateFieldMapping tempPrevMapping = new DS4StateFieldMapping(tempPrevState, eState, tp); // Only create one instance of previous DS4StateFieldMapping in case more than one multi-action
// button is assigned
if (previousFieldMapping == null)
{
previousFieldMapping = new DS4StateFieldMapping(tempPrevState, eState, tp);
}
bool activeCur = getBoolMapping2(device, action.trigger[0], cState, eState, tp, fieldMapping); bool activeCur = getBoolMapping2(device, action.trigger[0], cState, eState, tp, fieldMapping);
bool activePrev = getBoolMapping2(device, action.trigger[0], tempPrevState, eState, tp, tempPrevMapping); bool activePrev = getBoolMapping2(device, action.trigger[0], tempPrevState, eState, tp, previousFieldMapping);
if (activeCur && !activePrev) if (activeCur && !activePrev)
{ {
// pressed down // pressed down