diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-08-22 17:21:41 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-08-22 17:24:20 +0200 |
| commit | 2a5ee5dec93b768f6caeb109be2a052ca610e747 (patch) | |
| tree | ee7b644e2b71183e8b9c276e894fffcbf6b0c554 /main/main.cpp | |
| parent | 39c6b3d942e1b872538cd062347d5a5631f57f05 (diff) | |
| download | redot-engine-2a5ee5dec93b768f6caeb109be2a052ca610e747.tar.gz | |
Fix Android remote debug not hitting breakpoints
A change in `Main`'s API is needed. Please read the comment in the diff for an explanation.
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 e49c66dddf..425e736d93 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) { |