From e011f8ca70b45a32964a3eae5f8815352221f9b6 Mon Sep 17 00:00:00 2001
From: "Ben \"root\" Anderson" <roothorick@gmail.com>
Date: Sat, 30 Nov 2013 01:01:24 -0600
Subject: [PATCH] IH_Linux_Joystick: Make sure we have joysticks to manage
 before starting the thread.

---
 src/arch/InputHandler/InputHandler_Linux_Joystick.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp b/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp
index 39861329e5..96cba13f02 100644
--- a/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp
+++ b/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp
@@ -185,7 +185,7 @@ void InputHandler_Linux_Joystick::GetDevicesAndDescriptions( vector<InputDeviceI
 	// HACK: If IH_Linux_Joystick is constructed before IH_Linux_Event, our thread won't be started
 	// as part of the constructor. This isn't called until all InputHandlers have been constructed,
 	// and is (hopefully) in the same thread as TryDevice... so doublecheck our thread now.
-	if( !m_InputThread.IsCreated() ) StartThread();
+	if( fds[0] != -1 && !m_InputThread.IsCreated() ) StartThread();
 	
 	for(int i = 0; i < NUM_JOYSTICKS; ++i)
 	{