godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94923 from m4gr3d/fix_crash_on_android_terminate 

Fix crash that occurs on termination of the Godot engine on Android
This commit is contained in:
Rémi Verschelde 2024-07-30 12:29:10 +02:00
parent fbcde49cb6 30d63e8ab9
commit 862d881843
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/java_godot_lib_jni.cpp
View File

@ -83,6 +83,10 @@ static Vector3 magnetometer;
static Vector3 gyroscope; static Vector3 gyroscope;
static void _terminate(JNIEnv *env, bool p_restart = false) { static void _terminate(JNIEnv *env, bool p_restart = false) {
if (step.get() == STEP_TERMINATED) {
return;
}
step.set(STEP_TERMINATED); // Ensure no further steps are attempted and no further events are sent step.set(STEP_TERMINATED); // Ensure no further steps are attempted and no further events are sent
// lets cleanup // lets cleanup