aboutsummaryrefslogtreecommitdiff
path: root/platform/android/export/export.cpp
diff options
context:
space:
mode:
authorAriel Manzur2016-02-27 12:11:40 -0300
committerRémi Verschelde2016-02-29 09:00:35 +0100
commitf619b057514147b55bf35001a63645f23db847d3 (patch)
tree7d2bf1d8ad34cf370b792e57b784892bfc3878d6 /platform/android/export/export.cpp
parentaa94ff6daecc97c821a4f13e31957985deeffcd3 (diff)
downloadgodot-f619b057514147b55bf35001a63645f23db847d3.tar.gz
godot-f619b057514147b55bf35001a63645f23db847d3.tar.zst
godot-f619b057514147b55bf35001a63645f23db847d3.zip
Diffstat (limited to 'platform/android/export/export.cpp')
-rw-r--r--platform/android/export/export.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index d4755f4ed..6fc78e326 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) {