godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00: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

7
main/main.cpp
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"
@@ -842,7 +841,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) {