diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-29 00:09:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 00:09:27 +0200 |
| commit | a91d12ab945222b0fc89d4634e3e781ba8941f33 (patch) | |
| tree | f73e9053bbe0a5a3cd6587e14fb1a3f07bc19c71 /platform/android/java_glue.cpp | |
| parent | 9a8a0e20e5b73b6536c92b7b68e827e4f6d18f48 (diff) | |
| parent | 2a5ee5dec93b768f6caeb109be2a052ca610e747 (diff) | |
| download | redot-engine-a91d12ab945222b0fc89d4634e3e781ba8941f33.tar.gz | |
Merge pull request #10531 from RandomShaper/remove-old-android-setting
Sanitize Android debug
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 9abaae0a75..06abe9d751 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -1002,7 +1002,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaClassWrapper", java_class_wrapper)); _initialize_java_modules(); - Main::setup2(); + // Since Godot is initialized on the UI thread, _main_thread_id was set to that thread's id, + // but for Godot purposes, the main thread is the one running the game loop + Main::setup2(Thread::get_caller_id()); ++step; suspend_mutex->unlock(); input_mutex->unlock(); |