1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00

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.
This commit is contained in:
Pedro J. Estébanez
2017-08-22 17:21:41 +02:00
parent 39c6b3d942
commit 2a5ee5dec9
3 changed files with 10 additions and 4 deletions

View File

@@ -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) {