From 61350b3d989d07c77f9b9e58d47c4263294158ee Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:30:33 +0100
Subject: Core/Host: Allow frontends to block inputs

---
 Source/Core/InputCommon/ControlReference/ControlReference.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Source/Core/InputCommon/ControlReference/ControlReference.cpp')

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();
 }
 
 //
-- 
cgit v1.2.3