diff options
| author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-03-07 23:27:30 +0300 |
|---|---|---|
| committer | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-03-07 23:27:30 +0300 |
| commit | b4fccce1f6f4d5462d56e32934ff8652ea5d82ec (patch) | |
| tree | d32972b9a5755ba231099c57490967bf7e07cd44 /source/gameengine/GameLogic | |
| parent | c32ded36548b26c5722803556e2b502d3dbbba8a (diff) | |
BGE: Fix for regressions T43883 and T43456 (and T43876 likely). SDL joystick related
Only to create and destroy joystick devices for connected joysticks
Reviewers: campbellbarton, sybren, moguri
Reviewed By: sybren
Maniphest Tasks: T43883, T43876
Differential Revision: https://developer.blender.org/D1161
Diffstat (limited to 'source/gameengine/GameLogic')
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index daf869e3e61..b03570e3c28 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -127,7 +127,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex ) m_joynum = SDL_NumJoysticks(); - for (i=0; i<JOYINDEX_MAX; i++) { + for (i = 0; i < m_joynum; i++) { m_instance[i] = new SCA_Joystick(i); m_instance[i]->CreateJoystickDevice(); } @@ -149,7 +149,7 @@ void SCA_Joystick::ReleaseInstance() if (!SDL_CHECK(SDL_QuitSubSystem)) { return; } - for (int i=0; i<JOYINDEX_MAX; i++) { + for (int i = 0; i < m_joynum; i++) { if (m_instance[i]) { m_instance[i]->DestroyJoystickDevice(); delete m_instance[i]; |