diff options
| author | Rémi Verschelde | 2017-08-29 00:09:27 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-29 00:09:27 +0200 |
| commit | a91d12ab945222b0fc89d4634e3e781ba8941f33 (patch) | |
| tree | f73e9053bbe0a5a3cd6587e14fb1a3f07bc19c71 /main/main.cpp | |
| parent | 9a8a0e20e5b73b6536c92b7b68e827e4f6d18f48 (diff) | |
| parent | 2a5ee5dec93b768f6caeb109be2a052ca610e747 (diff) | |
| download | godot-a91d12ab945222b0fc89d4634e3e781ba8941f33.tar.gz godot-a91d12ab945222b0fc89d4634e3e781ba8941f33.tar.zst godot-a91d12ab945222b0fc89d4634e3e781ba8941f33.zip | |
Merge pull request #10531 from RandomShaper/remove-old-android-setting
Sanitize Android debug
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 00cb43b0a..532b5277b 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -69,7 +69,6 @@ #include "core/io/file_access_zip.h" #include "core/io/stream_peer_ssl.h" #include "core/io/stream_peer_tcp.h" -#include "core/os/thread.h" #include "main/input_default.h" #include "performance.h" #include "translation.h" @@ -886,7 +885,11 @@ error: return ERR_INVALID_PARAMETER; } -Error Main::setup2() { +Error Main::setup2(Thread::ID p_main_tid_override) { + + if (p_main_tid_override) { + Thread::_main_thread_id = p_main_tid_override; + } OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx); if (init_use_custom_pos) { |