diff options
| author | spiff_ <spiff_@svn> | 2010-11-09 18:52:42 +0000 |
|---|---|---|
| committer | spiff_ <spiff_@svn> | 2010-11-09 18:52:42 +0000 |
| commit | 784f8f8f5dfac221f4468db52c129089a7889802 (patch) | |
| tree | fcd65a43b16abb8cb0e81c22f662499c9bf49f65 /guilib | |
| parent | c8eeff6fcb4e68314095e54a738efe38dcf8c11b (diff) | |
fixed: properly use SDL_JoystickIndex instead of list index. thanks to moses.palmer
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35220 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/common/SDLJoystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guilib/common/SDLJoystick.cpp b/guilib/common/SDLJoystick.cpp index 34559a6555..fe6ccc974c 100644 --- a/guilib/common/SDLJoystick.cpp +++ b/guilib/common/SDLJoystick.cpp @@ -148,7 +148,7 @@ void CJoystick::Update() { if (SDL_JoystickGetButton(joy, b)) { - m_JoyId = j; + m_JoyId = SDL_JoystickIndex(joy); buttonId = b+1; j = numj-1; break; @@ -160,7 +160,7 @@ void CJoystick::Update() hatval = SDL_JoystickGetHat(joy, h); if (hatval != SDL_HAT_CENTERED) { - m_JoyId = j; + m_JoyId = SDL_JoystickIndex(joy); hatId = h + 1; m_HatState = hatval; j = numj-1; @@ -186,7 +186,7 @@ void CJoystick::Update() m_AxisId = GetAxisWithMaxAmount(); if (m_AxisId) { - m_JoyId = j; + m_JoyId = SDL_JoystickIndex(joy); j = numj-1; break; } |