From 5932c39c86bb7b75dc99be408d29690b316475d3 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 21 Feb 2015 21:54:13 -0400 Subject: [PATCH] Removed some redundant code. --HG-- branch : minor --- src/modules/joystick/sdl/Joystick.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp index 2cef123bd..bc2be0eab 100644 --- a/src/modules/joystick/sdl/Joystick.cpp +++ b/src/modules/joystick/sdl/Joystick.cpp @@ -122,17 +122,7 @@ bool Joystick::isConnected() const const char *Joystick::getName() const { - // Use the saved name if this Joystick isn't connected anymore. - if (!isConnected()) - return name.c_str(); - - // Prefer the Joystick name for consistency. - const char *joyname = SDL_JoystickName(joyhandle); - - if (!joyname && isGamepad()) - joyname = SDL_GameControllerName(controller); - - return joyname; + return name.c_str(); } int Joystick::getAxisCount() const