mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-24 12:56:53 +02:00
fix: stop a connected controller from disabling keyboard input (#194)
fix(input): stop a connected controller from disabling keyboard input
This commit is contained in:
@@ -208,7 +208,8 @@ void GameController::AddState(const ControllerState& state) {
|
|||||||
void GameController::Button(int id, uint32_t button, bool down) {
|
void GameController::Button(int id, uint32_t button, bool down) {
|
||||||
Common::LockGuard lock(m_mutex);
|
Common::LockGuard lock(m_mutex);
|
||||||
|
|
||||||
if (m_active_id == id) {
|
// The keyboard shares the player-1 pad with the active gamepad.
|
||||||
|
if (m_active_id == id || id == HOST_INPUT_CONTROLLER_ID) {
|
||||||
auto state = GetLastState();
|
auto state = GetLastState();
|
||||||
|
|
||||||
state.time = LibKernel::KernelGetProcessTime();
|
state.time = LibKernel::KernelGetProcessTime();
|
||||||
@@ -226,7 +227,7 @@ void GameController::Button(int id, uint32_t button, bool down) {
|
|||||||
void GameController::Axis(int id, Controller::Axis axis, int value) {
|
void GameController::Axis(int id, Controller::Axis axis, int value) {
|
||||||
Common::LockGuard lock(m_mutex);
|
Common::LockGuard lock(m_mutex);
|
||||||
|
|
||||||
if (m_active_id == id) {
|
if (m_active_id == id || id == HOST_INPUT_CONTROLLER_ID) {
|
||||||
auto state = GetLastState();
|
auto state = GetLastState();
|
||||||
|
|
||||||
state.time = LibKernel::KernelGetProcessTime();
|
state.time = LibKernel::KernelGetProcessTime();
|
||||||
|
|||||||
Reference in New Issue
Block a user