godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #10530 from RandomShaper/remove-old-android-setting-2.1

Browse Source 
Sanitize Android debug (2.1)
This commit is contained in:
Rémi Verschelde
2017-08-29 00:10:31 +02:00
committed by GitHub
parent b61462268e e42d62ae73
commit 891f6c9b63
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/java_glue.cpp
View File

@@ -1001,7 +1001,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job
Globals::get_singleton()->add_singleton(Globals::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();