Commit 9261e473d668bf3831da4d7a7da301f9aeebfee5

Sam Lantinga 2019-06-07T09:00:24

Potential fix for a crash we're seeing on Android that should in theory never happen.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 430934c..a44b643 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -1044,7 +1044,10 @@ SDL_JoystickUpdate(void)
 
     for (joystick = SDL_joysticks; joystick; joystick = joystick->next) {
         if (joystick->attached) {
-            joystick->driver->Update(joystick);
+            /* This should always be true, but seeing a crash in the wild...? */
+            if (joystick->driver) {
+                joystick->driver->Update(joystick);
+            }
 
             if (joystick->delayed_guide_button) {
                 SDL_GameControllerHandleDelayedGuideButton(joystick);