From b3acc7403f33033bfce6db92ea4b8ec6fc968665 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Wed, 23 Oct 2019 17:20:42 -0500
Subject: InputCommon: Support detecting combinations of inputs. (Hotkeys)

---
 Source/Core/InputCommon/ControllerInterface/Device.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')

diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h
index d923d97076..43e61e53fd 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@@ -194,7 +194,7 @@ public:
 
   bool HasConnectedDevice(const DeviceQualifier& qualifier) const;
 
-  std::pair<std::shared_ptr<Device>, Device::Input*>
+  std::vector<std::pair<std::shared_ptr<Device>, Device::Input*>>
   DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings) const;
 
 protected:
-- 
cgit v1.2.3