From 88015683253ce33fa7abc6a63b8b6821536a187a Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 15 Jan 2016 10:45:20 -0800
Subject: [PATCH] DriverStation::GetJoystickName(): Make work for stick>0.

Change-Id: I1c62742cf8b80c81d21c2198f966c8151a758a01
---
 wpilibc/Athena/src/DriverStation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wpilibc/Athena/src/DriverStation.cpp b/wpilibc/Athena/src/DriverStation.cpp
index 36837a132f..344d951351 100644
--- a/wpilibc/Athena/src/DriverStation.cpp
+++ b/wpilibc/Athena/src/DriverStation.cpp
@@ -159,7 +159,7 @@ std::string DriverStation::GetJoystickName(uint32_t stick) const {
   if (stick >= kJoystickPorts) {
     wpi_setWPIError(BadJoystickIndex);
   }
-  std::string retVal(m_joystickDescriptor[0].name);
+  std::string retVal(m_joystickDescriptor[stick].name);
   return retVal;
 }