From e6e4dad915792590aa9cb69a24f1abd25245a0ef Mon Sep 17 00:00:00 2001
From: Pritam Ghanghas <pritam.ghanghas@senserobotics.com>
Date: Fri, 20 Oct 2017 13:09:10 -0400
Subject: [PATCH] fix typo which breaks joystick detection on Android

---
 src/Joystick/JoystickManager.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Joystick/JoystickManager.cc b/src/Joystick/JoystickManager.cc
index e32d399dba..2b1c66f3a0 100644
--- a/src/Joystick/JoystickManager.cc
+++ b/src/Joystick/JoystickManager.cc
@@ -73,7 +73,7 @@ void JoystickManager::_setActiveJoystickFromSettings(void)
     // Get the latest joystick mapping
     newMap = JoystickSDL::discover(_multiVehicleManager);
 #elif defined(__android__)
-    _name2JoystickMap = JoystickAndroid::discover(_multiVehicleManager);
+    newMap = JoystickAndroid::discover(_multiVehicleManager);
 #endif
 
     if (_activeJoystick && !newMap.contains(_activeJoystick->name())) {
-- 
GitLab