diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-27 18:06:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-27 18:06:11 +0400 |
| commit | 49f84ef9ed6a2c86552c3727e08a8a5074cc3775 (patch) | |
| tree | 252fe8ae7d712305cbc94e1917c64668a1f46b05 /source/gameengine/GameLogic | |
| parent | 24c0f1873e747dbfdf99637e89ba8c0d6b166f37 (diff) | |
Fix part of #26850: OS X game player was showing _NSAutoreleaseNoPool()
error messages on start. These were coming from initializing the SDL video
subsystem as part of Joystick init. We do not need this, as video stuff is
covered by GHOST, most likely this was conflicting.
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 a73a6d4631b..0e08f157a6a 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -89,7 +89,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex ) { int i; // do this once only - if(SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO ) == -1 ){ + if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -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_INIT_VIDEO ); + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); #endif } } |