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

Fixed Joystick:getName to be more consistent

Browse Source
This commit is contained in:
Alex Szpakowski
2013-10-05 04:07:39 -03:00
parent 8b7f151a4d
commit 25caa188ba
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/Joystick.cpp
+6 -4
View File
@@ -124,11 +124,13 @@ const char *Joystick::getName() const
if (!isConnected()) if (!isConnected())
return name.c_str(); return name.c_str();
// Prefer SDL's GameController name, if possible. // Prefer the Joystick name for consistency.
if (isGamepad()) const char *joyname = SDL_JoystickName(joyhandle);
return SDL_GameControllerName(controller);
return SDL_JoystickName(joyhandle); if (!joyname && isGamepad())
joyname = SDL_GameControllerName(controller);
return joyname;
} }
int Joystick::getAxisCount() const int Joystick::getAxisCount() const