Merge pull request #19 from Electronicks/master

Fix to chords adding themselves multiple times to the stack
JibbSmart · Apr 25, 2020 · c39595d · c39595d
2 parents fb62dd2 + fd56317
commit c39595d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/JoyShockMapper/src/main.cpp b/JoyShockMapper/src/main.cpp
@@ -722,16 +722,18 @@ class JoyShock {
 	}
 
 	void handleButtonChange(int index, bool pressed) {
-		if(pressed)
-			btnCommon.chordStack.push_front(index); // Always push at the fromt to make it a stack
-		else {
-			auto foundChord = std::find(btnCommon.chordStack.begin(), btnCommon.chordStack.end(), index);
+		auto foundChord = std::find(btnCommon.chordStack.begin(), btnCommon.chordStack.end(), index);
+		if (!pressed)
+		{
 			if (foundChord != btnCommon.chordStack.end())
 			{
 				// The chord is released
 				btnCommon.chordStack.erase(foundChord);
 			}
 		}
+		else if (foundChord == btnCommon.chordStack.end()) {
+			btnCommon.chordStack.push_front(index); // Always push at the fromt to make it a stack
+		}
 
 		switch (buttons[index]._btnState)
 		{
@@ -1067,6 +1069,10 @@ class JoyShock {
 				handleButtonChange(softIndex, true);
 			}
 		}
+		else
+		{
+			handleButtonChange(softIndex, false);
+		}
 		break;
 		case DstState::PressStart:
 		if (pressed <= trigger_threshold) {