Просмотр исходного кода

Android: prevent removing joystick if SDL hasn't been initialized yet

Sylvain 1 день назад
Родитель
Сommit
9986c89da0
1 измененных файлов с 6 добавлено и 0 удалено
  1. 6 0
      src/joystick/android/SDL_sysjoystick.c

+ 6 - 0
src/joystick/android/SDL_sysjoystick.c

@@ -497,6 +497,12 @@ void Android_RemoveJoystick(int device_id)
     SDL_joylist_item *item = SDL_joylist;
     SDL_joylist_item *prev = NULL;
 
+    // Java might notify us about joysticks being removed before joysticks have
+    // been initialized.
+    if (!SDL_JoysticksInitialized()) {
+        return;
+    }
+
     SDL_LockJoysticks();
 
     // Don't call JoystickByDeviceId here or there'll be an infinite loop!