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

Prefer the Joystick name rather than the GameController name for Joystick:getName

Browse Source
This commit is contained in:
Alex Szpakowski
2013-08-29 01:39:21 -03:00
parent ec9dec6b80
commit deba2926ce
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/Joystick.cpp
+7 -5
View File
@@ -70,11 +70,13 @@ bool Joystick::open(int deviceindex)
// See if SDL thinks this is a Game Controller.
openGamepad(deviceindex);
// Prefer the GameController name.
if (controller)
name = SDL_GameControllerName(controller);
else
name = SDL_JoystickName(joyhandle);
// Prefer the Joystick name for consistency.
const char *joyname = SDL_JoystickName(joyhandle);
if (!joyname && controller)
joyname = SDL_GameControllerName(controller);
if (joyname)
name = joyname;
}
return isConnected();