[Bf-blender-cvs] [84dde30] blender-v2.73-release: Fix T43066: Joystick broken in GE since 2.73rc

[Campbell Barton]

Commit: 84dde30662c565f0ba843d20fb271f1591b77321
Author: Campbell Barton
Date:   Fri Jan 2 17:12:39 2015 +1100
Branches: blender-v2.73-release
https://developer.blender.org/rB84dde30662c565f0ba843d20fb271f1591b77321

Fix T43066: Joystick broken in GE since 2.73rc

Caused by move to SDL2, fix thanks to jensverwiebe.

===================================================================

M	source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp

===================================================================

diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 765f056..e3bc409 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -111,7 +111,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
 		char *videodriver = getenv("SDL_VIDEODRIVER");
 		BLI_setenv("SDL_VIDEODRIVER", "dummy");
 
-		int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) != -1 );
+		int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1 );
 
 		BLI_setenv("SDL_VIDEODRIVER", videodriver);
 #  endif
@@ -156,11 +156,7 @@ void SCA_Joystick::ReleaseInstance()
 		/* The video subsystem is required for joystick input to work. However,
 		 * when GHOST is running under SDL, video is freed elsewhere.
 		 * Do this once only. */
-#  ifdef WITH_GHOST_SDL
 		SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-#  else
-		SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO);
-#  endif
 #endif /* WITH_SDL */
 	}
 }