From 1cf0b21cda562bade9152958f1525e5ac281ab9c Mon Sep 17 00:00:00 2001
From: SmileTheory <SmileTheory@gmail.com>
Date: Thu, 11 Aug 2016 00:46:43 -0700
Subject: [PATCH] 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 802af4dd..d0ebebce 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: