diff options
| author | Bastien Bouclet | 2017-05-01 12:19:44 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-12-26 21:11:05 +0100 |
| commit | a86eae63235357c942a55f2b320187880ebe823e (patch) | |
| tree | 2ea73c585ce162efbc1725fe8d092e0b4d216b5c /backends/platform | |
| parent | 5838894f2434b027003a876ce795e2662597ce97 (diff) | |
| download | scummvm-rg350-a86eae63235357c942a55f2b320187880ebe823e.tar.gz scummvm-rg350-a86eae63235357c942a55f2b320187880ebe823e.tar.bz2 scummvm-rg350-a86eae63235357c942a55f2b320187880ebe823e.zip | |
SDL: Only enable joystick related features when joysticks are enabled
Fixes #9714.
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 6 |
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); } |