diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2019-03-23 21:11:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 21:11:33 +0100 |
| commit | c89139d75d9a9195eb04ea417bf88ae281693d1b (patch) | |
| tree | fbe208ff62aa95dcc5ae7c29b1d6390d566fc23b /Source/Core/InputCommon/ControlReference/ControlReference.cpp | |
| parent | 672b582bec0ceecf8228358ef2579f3960c67b23 (diff) | |
| parent | 7cfb626a834cdc065e56e529bbed81df755a7c09 (diff) | |
Merge pull request #7903 from spycrab/imgui_np_chat
Add imgui-based Netplay Chat
Diffstat (limited to 'Source/Core/InputCommon/ControlReference/ControlReference.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControlReference/ControlReference.cpp | 5 |
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(); } // |