Merge pull request #112760 from Benjamin-Dobell/fix/android/gamepad-connect-on-startup

Repiteo · Repiteo · commit c36e846fb1f7 · 2025-11-14T14:23:16.000-06:00
Android: Fix crash when gamepad connects immediately upon app startup
diff --git 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);
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, j`
`436`	`436`	`JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) {`
`437`	`437`	`if (os_android) {`
`438`	`438`	`String name = jstring_to_string(p_name, env);`
`439`		`- Input::get_singleton()->joy_connection_changed(p_device, p_connected, name);`
	`439`	`+ Input *input = Input::get_singleton();`
	`440`	`+ if (input) {`
	`441`	`+ input->joy_connection_changed(p_device, p_connected, name);`
	`442`	`+ }`
`440`	`443`	`}`
`441`	`444`	`}`
`442`	`445`