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

added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings

Browse Source 
(cherry picked from commit 30d0ca9766)
This commit is contained in:
Ariel Manzur
2016-02-27 12:11:40 -03:00
committed by Rémi Verschelde
parent aa94ff6dae
commit f619b05751
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/export/export.cpp
View File

@@ -1493,6 +1493,16 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
OS::get_singleton()->delay_usec(3000000);
}
if (EditorSettings::get_singleton()->get("android/shutdown_adb_on_exit")) {
String adb=EditorSettings::get_singleton()->get("android/adb");
if (!FileAccess::exists(adb)) {
return; //adb not configured
}
List<String> args;
args.push_back("kill-server");
OS::get_singleton()->execute(adb,args,true);
};
}
Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {