aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/sdl/sdl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 360baf9d1e..3082a69ebf 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -182,8 +182,10 @@ bool OSystem_SDL::hasFeature(Feature f) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (f == kFeatureClipboardSupport) return true;
#endif
- if (f == kFeatureJoystickDeadzone) return true;
- if (f == kFeatureKbdMouseSpeed) return true;
+ if (f == kFeatureJoystickDeadzone || f == kFeatureKbdMouseSpeed) {
+ bool joystickSupportEnabled = ConfMan.getInt("joystick_num") >= 0;
+ return joystickSupportEnabled;
+ }
return ModularBackend::hasFeature(f);
}