diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-12-02 09:48:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-02 09:48:42 -0800 |
| commit | c48ccdb1cd7a67fc992d192370cb1c03c6ee874e (patch) | |
| tree | 5fc03dca93fa8e52265fad357dd41313c033c721 /Source/Core | |
| parent | 76fbdbb06e27e3cf408cfac38a5933eafd43d189 (diff) | |
| parent | 05879875f6b6c19c55411c09af7f930991cda919 (diff) | |
Merge pull request #6228 from JosJuice/usb-keyboard-background-input
Make USB keyboard input respect the background input setting
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/IOS/USB/USB_KBD.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/Core/IOS/USB/USB_KBD.cpp b/Source/Core/Core/IOS/USB/USB_KBD.cpp index 185353a150..484b78d2ce 100644 --- a/Source/Core/Core/IOS/USB/USB_KBD.cpp +++ b/Source/Core/Core/IOS/USB/USB_KBD.cpp @@ -14,6 +14,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" // Local core functions #include "Core/HW/Memmap.h" +#include "InputCommon/ControlReference/ControlReference.h" // For background input check #ifdef _WIN32 #include <windows.h> @@ -72,7 +73,8 @@ IPCCommandResult USB_KBD::Write(const ReadWriteRequest& request) IPCCommandResult USB_KBD::IOCtl(const IOCtlRequest& request) { - if (SConfig::GetInstance().m_WiiKeyboard && !Core::WantsDeterminism() && !m_MessageQueue.empty()) + if (SConfig::GetInstance().m_WiiKeyboard && !Core::WantsDeterminism() && + ControlReference::InputGateOn() && !m_MessageQueue.empty()) { Memory::CopyToEmu(request.buffer_out, &m_MessageQueue.front(), sizeof(SMessageData)); m_MessageQueue.pop(); |