diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-17 01:21:31 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-17 01:21:31 +0200 |
| commit | 8cf21cdcdb30d1587a03b6fbb131465f489d3d25 (patch) | |
| tree | 10f6a451f4f3b632b9d32382cbc4389c90772462 /Source/Core/InputCommon/ControllerInterface/Device.cpp | |
| parent | 30e4366d280b4e801de4caa86cb787901d733e7b (diff) | |
| parent | 44307c950888a4942a35b0176e2601c266894983 (diff) | |
Merge pull request #633 from magcius/wip/input-focus-fix
Fix input focus issues
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 61057c8162..84af8649a8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -84,7 +84,7 @@ bool Device::Control::InputGateOn() { if (SConfig::GetInstance().m_BackgroundInput) return true; - else if (Host_RendererHasFocus()) + else if (Host_RendererHasFocus() || Host_UIHasFocus()) return true; else return false; |