diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-09-01 21:31:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 21:31:17 +0200 |
| commit | 8e9857d3cda9db46ec0eab076a4d7bea2e1c848f (patch) | |
| tree | fe878a7020aff9e710d533047fda99281e6b9a34 /Source/Core/InputCommon/InputConfig.cpp | |
| parent | a7285486d90c46ba78a9f60a310e5d942bb54211 (diff) | |
| parent | ef95bf26cbf826ba627fb66f97c3f91cb24860d6 (diff) | |
Merge pull request #5954 from khg8m3r/OSXKeyboard
Clean up OSX input selection
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 86bda0189f..8ae380ad33 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -136,8 +136,7 @@ bool InputConfig::IsControllerControlledByGamepadDevice(int index) const const auto& controller = m_controllers.at(index).get()->default_device; // Filter out anything which obviously not a gamepad - return !((controller.source == "Keyboard") // OSX IOKit Keyboard/Mouse - || (controller.source == "Quartz") // OSX Quartz Keyboard/Mouse + return !((controller.source == "Quartz") // OSX Quartz Keyboard/Mouse || (controller.source == "XInput2") // Linux and BSD Keyboard/Mouse || (controller.source == "Android" && controller.name == "Touchscreen") // Android Touchscreen |