From a55e63c69713ecd297019fe26c28d35df947a419 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 14 Mar 2011 21:07:28 +0000 Subject: Fix DInput and SDL. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7345 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp') 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::const_iterator di = m_devices.begin(), -- cgit v1.2.3