Only query jbutton state for button events

4 years ago · a0bc3f218f
1 changed files with 3 additions and 1 deletions
--- a/Source/controls/controller.cpp
+++ b/Source/controls/controller.cpp
@ -100,7 +100,9 @@ ControllerButtonEvent ToControllerButtonEvent(const SDL_Event &event)
 	const Joystick *joystick = Joystick::Get(event);
 	if (joystick != nullptr) {
 		result.button = devilution::Joystick::ToControllerButton(event);
-		result.state = event.jbutton.state;
+		result.state = ControllerButtonState_PRESSED;
+		if (IsAnyOf(event.type, SDL_JOYBUTTONUP, SDL_JOYBUTTONDOWN))
+			result.state = event.jbutton.state;
 	}

 	return result;