summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference
diff options
context:
space:
mode:
authorLeo Lam <leolino.lam@gmail.com>2017-07-14 13:08:13 +0800
committerGitHub <noreply@github.com>2017-07-14 13:08:13 +0800
commit460b81ac061cb334d3d74611c8356d5a82b0ec5f (patch)
tree118194449dd001aef01d9a6f93b059775d22770f /Source/Core/InputCommon/ControlReference
parentd7efac6ed5d1e64f7f00aff61a09767aad4715a1 (diff)
parent0019c34c7324c79c5504c2669e4f01fb0f953faf (diff)
Merge pull request #5778 from ligfx/fixinputbitmaps
DolphinWX: fix input bitmaps not working when background input is off
Diffstat (limited to 'Source/Core/InputCommon/ControlReference')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index c92d3601ed..e4162e22a7 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -17,7 +17,8 @@ constexpr ControlState INPUT_DETECT_THRESHOLD = 0.55;
bool ControlReference::InputGateOn()
{
- return SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus();
+ return SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
+ Host_UINeedsControllerState();
}
//