mirror of
https://github.com/godotengine/godot
synced 2024-09-05 06:28:34 +00:00
added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings
This commit is contained in:
parent
08e0e64a19
commit
30d0ca9766
|
@ -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) {
|
||||
|
|
|
@ -564,13 +564,29 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
|
|||
set("resources/save_compressed_resources",true);
|
||||
set("resources/auto_reload_modified_images",true);
|
||||
|
||||
if (p_extra_config.is_valid() && p_extra_config->has_section("init_projects") && p_extra_config->has_section_key("init_projects", "list")) {
|
||||
if (p_extra_config.is_valid()) {
|
||||
|
||||
Vector<String> list = p_extra_config->get_value("init_projects", "list");
|
||||
for (int i=0; i<list.size(); i++) {
|
||||
if (p_extra_config->has_section("init_projects") && p_extra_config->has_section_key("init_projects", "list")) {
|
||||
|
||||
String name = list[i].replace("/", "::");
|
||||
set("projects/"+name, list[i]);
|
||||
Vector<String> list = p_extra_config->get_value("init_projects", "list");
|
||||
for (int i=0; i<list.size(); i++) {
|
||||
|
||||
String name = list[i].replace("/", "::");
|
||||
set("projects/"+name, list[i]);
|
||||
};
|
||||
};
|
||||
|
||||
if (p_extra_config->has_section("presets")) {
|
||||
|
||||
List<String> keys;
|
||||
p_extra_config->get_section_keys("presets", &keys);
|
||||
|
||||
for (List<String>::Element *E=keys.front();E;E=E->next()) {
|
||||
|
||||
String key = E->get();
|
||||
Variant val = p_extra_config->get_value("presets", key);
|
||||
set(key, val);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue