Fix unwanted cleaning of F1 and F2 button masks (#200)

OpenStickCommunity · May 1, 2023 · 60e28c6 · 60e28c6
1 parent 3fb6617
commit 60e28c6
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/gamepad.cpp b/src/gamepad.cpp
@@ -256,15 +256,19 @@ GamepadHotkey Gamepad::hotkey()
 		if (state.dpad == hotkeyF1Down .dpadMask) action = hotkeyF1Down .action;
 		if (state.dpad == hotkeyF1Left .dpadMask) action = hotkeyF1Left .action;
 		if (state.dpad == hotkeyF1Right.dpadMask) action = hotkeyF1Right.action;
-		state.dpad = 0;
-		state.buttons &= ~(f1Mask);	
+		if (action != HOTKEY_NONE) {
+			state.dpad = 0;
+			state.buttons &= ~(f1Mask);
+		}
 	} else if (pressedF2()) {
 		if (state.dpad == hotkeyF2Up   .dpadMask) action = hotkeyF2Up   .action;
 		if (state.dpad == hotkeyF2Down .dpadMask) action = hotkeyF2Down .action;
 		if (state.dpad == hotkeyF2Left .dpadMask) action = hotkeyF2Left .action;
 		if (state.dpad == hotkeyF2Right.dpadMask) action = hotkeyF2Right.action;
-		state.dpad = 0;
-		state.buttons &= ~(f2Mask);	
+		if (action != HOTKEY_NONE) {
+			state.dpad = 0;
+			state.buttons &= ~(f2Mask);
+		}
 	}
 
 	switch (action) {