From 481ea0b776bbab92b500540f59c5a191c6e93cba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 9 Sep 2017 22:54:01 +0300
Subject: Add workaround for fix alt-tab issue in SDL2.

Also add option to enable/disable this workaround.
---
 src/input/joystick.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/input/joystick.cpp')

diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index 1e53af5b1..10ed33924 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -180,7 +180,8 @@ void Joystick::logic()
 
     mDirection = 0;
 
-    if (mUseInactive || settings.inputFocused)
+    if (mUseInactive ||
+        settings.inputFocused != KeyboardFocus::Unfocused)
     {
         // X-Axis
         int position = SDL_JoystickGetAxis(mJoystick, 0);
@@ -350,7 +351,8 @@ bool Joystick::validate() const
     if (mCalibrating || !mEnabled || !mCalibrated)
         return false;
 
-    return mUseInactive || settings.inputFocused;
+    return mUseInactive ||
+        settings.inputFocused != KeyboardFocus::Unfocused;
 }
 
 void Joystick::handleRepeat(const int time)
-- 
cgit v1.2.3-70-g09d2