summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControlReference/ControlReference.cpp
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2019-03-18 17:30:33 +0100
committerspycrab <spycrab@users.noreply.github.com>2019-03-21 13:16:21 +0100
commit61350b3d989d07c77f9b9e58d47c4263294158ee (patch)
treef48705631152d35881741785dd6cc4ae86df2938 /Source/Core/InputCommon/ControlReference/ControlReference.cpp
parent0a3279ae6b8589ef9800ff361bc46e509fee99cf (diff)
Core/Host: Allow frontends to block inputs
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ControlReference.cpp')
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.cpp b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
index 1f392c4e3a..cfc6fa658e 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.cpp
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.cpp
@@ -14,8 +14,9 @@ using namespace ciface::ExpressionParser;
bool ControlReference::InputGateOn()
{
- return SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
- Host_UINeedsControllerState();
+ return (SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
+ Host_UINeedsControllerState()) &&
+ !Host_UIBlocksControllerState();
}
//