From 3907cd090e8df5d15eb2d10486df695f75217809 Mon Sep 17 00:00:00 2001
From: Nate Weibley <nate.weibley@prioria.com>
Date: Thu, 19 Jan 2017 16:21:01 -0500
Subject: [PATCH] Explicitly init SDL joystick to work around upstream bug

---
 src/Joystick/JoystickSDL.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Joystick/JoystickSDL.cc b/src/Joystick/JoystickSDL.cc
index c99c4c6bf..303c3005c 100644
--- a/src/Joystick/JoystickSDL.cc
+++ b/src/Joystick/JoystickSDL.cc
@@ -15,7 +15,7 @@ JoystickSDL::JoystickSDL(const QString& name, int axisCount, int buttonCount, in
 QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicleManager) {
     static QMap<QString, Joystick*> ret;
 
-    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_NOPARACHUTE) < 0) {
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE) < 0) {
         qWarning() << "Couldn't initialize SimpleDirectMediaLayer:" << SDL_GetError();
         return ret;
     }
-- 
2.22.0