diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 2d2133b2e..47098e904 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -16,6 +16,8 @@ #include "video_core/video_core.h" +#include "input_common/input_common.h" + namespace Service { namespace HID { @@ -49,7 +51,7 @@ static u32 next_touch_index; void Update() { SharedMem* mem = reinterpret_cast(shared_mem->GetPointer()); - const PadState state = VideoCore::g_emu_window->GetPadState(); + const PadState state = (InputCommon::g_user_input == nullptr) ? VideoCore::g_emu_window->GetPadState() : InputCommon::g_user_input->GetPadState(); if (mem == nullptr) { LOG_DEBUG(Service_HID, "Cannot update HID prior to mapping shared memory!");