LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 12:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed some redundant code.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-21 21:54:13 -04:00
parent 33d20620b5
commit 5932c39c86
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/Joystick.cpp
+1 -11
View File
@@ -122,17 +122,7 @@ bool Joystick::isConnected() const
const char *Joystick::getName() const const char *Joystick::getName() const
{ {
// Use the saved name if this Joystick isn't connected anymore. return name.c_str();
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;
} }
int Joystick::getAxisCount() const int Joystick::getAxisCount() const