From 5caf6ad8b910abfa4014e1a66d2417c590578639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 20 Mar 2016 11:51:50 +0100 Subject: [PATCH] Expose android/shutdown_adb_on_exit parameter and default to true It was added in 30d0ca9 for the Steam build but only enabled when parsing a ._sc_ file that would define it. It is now available for all users to toggle, in and outside of Steam. Fixes #4073. (cherry picked from commit c58494038702876403687e5b76a100f077b8d9b3) --- platform/android/export/export.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index e65a712a170..60f4e61c68d 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1772,6 +1772,7 @@ void register_android_exporter() { //EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore")); EDITOR_DEF("android/timestamping_authority_url",""); EDITOR_DEF("android/use_remote_debug_over_adb",false); + EDITOR_DEF("android/shutdown_adb_on_exit",true); Ref exporter = Ref( memnew(EditorExportPlatformAndroid) ); EditorImportExport::get_singleton()->add_export_platform(exporter);