From 30d0ca97664a7645ce8b2af7d169f0cee3248953 Mon Sep 17 00:00:00 2001 From: Ariel Manzur Date: Sat, 27 Feb 2016 12:11:40 -0300 Subject: added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings --- platform/android/export/export.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'platform') diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index d4755f4ed6..6fc78e3264 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -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 args; + args.push_back("kill-server"); + OS::get_singleton()->execute(adb,args,true); + }; } Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { -- cgit v1.2.3