[ioquake3] 22/59: Fix black screen when in_joystick disabled but controller connected.

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 1cf0b21cda562bade9152958f1525e5ac281ab9c
Author: SmileTheory <SmileTheory at gmail.com>
Date:   Thu Aug 11 00:46:43 2016 -0700

    Fix black screen when in_joystick disabled but controller connected.
---
 code/sdl/sdl_input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 802af4d..d0ebebc 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -1062,7 +1062,8 @@ static void IN_ProcessEvents( void )
 
 			case SDL_CONTROLLERDEVICEADDED:
 			case SDL_CONTROLLERDEVICEREMOVED:
-				IN_InitJoystick();
+				if (in_joystick->integer)
+					IN_InitJoystick();
 				break;
 
 			case SDL_QUIT:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git