diff options
author | Ariel Manzur <ariel@okamstudio.com> | 2016-02-27 12:11:40 -0300 |
---|---|---|
committer | Ariel Manzur <ariel@okamstudio.com> | 2016-02-27 12:11:40 -0300 |
commit | 30d0ca97664a7645ce8b2af7d169f0cee3248953 (patch) | |
tree | 91ff0ccd921e93ea1b2051e57a831748c7170fd6 /platform | |
parent | 08e0e64a192940468b0f74b594fbaff32b39dfd6 (diff) |
added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/export/export.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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<String> args; + args.push_back("kill-server"); + OS::get_singleton()->execute(adb,args,true); + }; } Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { |