From 585389af2412f917dad04cf471270c24993b7054 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Sat, 15 Nov 2025 01:13:17 +1100 Subject: [PATCH] Fix crash when gamepad connects immediately upon Android app startup --- platform/android/java_godot_lib_jni.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 8b3035301bb..0692b90b824 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -436,7 +436,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, j JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) { if (os_android) { String name = jstring_to_string(p_name, env); - Input::get_singleton()->joy_connection_changed(p_device, p_connected, name); + Input *input = Input::get_singleton(); + if (input) { + input->joy_connection_changed(p_device, p_connected, name); + } } }