diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-03-14 21:07:28 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-03-14 21:07:28 +0000 |
| commit | a55e63c69713ecd297019fe26c28d35df947a419 (patch) | |
| tree | 3e9f81d9056218161fead0e5e4e877fad57e6340 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | bfe7b028ce5406df1f271b667e225725de1ea5db (diff) | |
Fix DInput and SDL.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7345 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 724e429de2..b738d5aabb 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -545,7 +545,11 @@ ControllerInterface::Device::Output* ControllerInterface::Device::FindOutput(con ControllerInterface::Device::Input* ControllerInterface::FindInput(const std::string& name, const Device* def_dev) const { if (def_dev) - return def_dev->FindInput(name); + { + Device::Input* const inp = def_dev->FindInput(name); + if (inp) + return inp; + } std::vector<Device*>::const_iterator di = m_devices.begin(), |