summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-03-20 11:51:50 +0100
committerRémi Verschelde <rverschelde@gmail.com>2016-03-20 16:55:54 +0100
commitc58494038702876403687e5b76a100f077b8d9b3 (patch)
treef13c0ac1fe6beb40bd6a16d9de0024643d4edc51
parentb8daa7e6e6c75324bd1aab346975b38721667c2f (diff)
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.
-rw-r--r--platform/android/export/export.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 0f1cbdc73a..de1a9a29d9 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1771,6 +1771,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<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) );
EditorImportExport::get_singleton()->add_export_platform(exporter);