archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #28014: joystick sensor not working. Broke this with an earlier commit

Browse Source 
trying to fix blenderplayer startup warnings. It seems we do need to init
the SDL video subsystem even if we only want events, thanks Juha Maki-Kanto
for pointing this out.
This commit is contained in:
Brecht Van Lommel
2011-07-25 15:44:41 +00:00
parent fee1594a65
commit 62415cab05
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@@ -89,7 +89,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
{
int i;
// do this once only
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) == -1 ){
echo("Error-Initializing-SDL: " << SDL_GetError());
return NULL;
}
@@ -124,7 +124,7 @@ void SCA_Joystick::ReleaseInstance()
m_instance[i]= NULL;
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO);
#endif
}
}