From deeb8619182d6c935a866de0f9929dbadbbd74d3 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 8 Apr 2021 11:33:59 +1000
Subject: [PATCH] CommonHostInterface: Fix rumble not applying to non-first
 controller

---
 src/frontend-common/common_host_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index b03bc2816..88dd4c27d 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -1361,7 +1361,7 @@ void CommonHostInterface::ClearInputMap()
 void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback)
 {
   ControllerRumbleState rumble;
-  rumble.controller_index = 0;
+  rumble.controller_index = controller_index;
   rumble.num_motors = std::min<u32>(num_motors, ControllerRumbleState::MAX_MOTORS);
   rumble.last_strength.fill(0.0f);
   rumble.update_callback = std::move(callback);