godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Implement a "Recovery Mode" for recovering crashing/hanging projects during initialization

Browse Source
This commit is contained in:
Ricardo Subtil
2024-04-30 21:13:10 +01:00
parent bdf625bd54
commit b77aa473a1
34 changed files with 484 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/os_android.cpp
View File

@@ -413,7 +413,7 @@ String OS_Android::get_model_name() const {
}
String OS_Android::get_data_path() const {
return get_user_data_dir();
return OS::get_user_data_dir();
}
void OS_Android::_load_system_font_config() const {
@@ -647,12 +647,12 @@ String OS_Android::get_executable_path() const {
return OS::get_executable_path();
}
String OS_Android::get_user_data_dir() const {
String OS_Android::get_user_data_dir(const String &p_user_dir) const {
if (!data_dir_cache.is_empty()) {
return data_dir_cache;
}
String data_dir = godot_io_java->get_user_data_dir();
String data_dir = godot_io_java->get_user_data_dir(p_user_dir);
if (!data_dir.is_empty()) {
data_dir_cache = _remove_symlink(data_dir);
return data_dir_cache;
@@ -764,7 +764,7 @@ void OS_Android::vibrate_handheld(int p_duration_ms, float p_amplitude) {
}
String OS_Android::get_config_path() const {
return get_user_data_dir().path_join("config");
return OS::get_user_data_dir().path_join("config");
}
void OS_Android::benchmark_begin_measure(const String &p_context, const String &p_what) {
@@ -897,7 +897,7 @@ String OS_Android::get_system_ca_certificates() {
}
Error OS_Android::setup_remote_filesystem(const String &p_server_host, int p_port, const String &p_password, String &r_project_path) {
r_project_path = get_user_data_dir();
r_project_path = OS::get_user_data_dir();
Error err = OS_Unix::setup_remote_filesystem(p_server_host, p_port, p_password, r_project_path);
if (err == OK) {
remote_fs_dir = r_project_path;