summaryrefslogtreecommitdiff
path: root/src/input/joystick.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/joystick.cpp')
-rw-r--r--src/input/joystick.cpp6
1 files changed, 4 insertions, 2 deletions
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)