seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS: Remove code duplicate in XDG paths handling

Browse Source 
Follow-up to #48542.
This commit is contained in:
Rémi Verschelde
2021-05-21 12:48:12 +02:00
parent 4eab92104c
commit 0e1d45b210
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
platform/windows/os_windows.cpp
View File

@ -637,13 +637,12 @@ String OS_Windows::get_config_path() const {
return get_environment("XDG_CONFIG_HOME");
} else {
WARN_PRINT_ONCE("`XDG_CONFIG_HOME` is a relative path. Ignoring its value and falling back to `%APPDATA%` or `.` per the XDG Base Directory specification.");
return has_environment("APPDATA") ? get_environment("APPDATA") : ".";
}
} else if (has_environment("APPDATA")) {
return get_environment("APPDATA");
} else {
return ".";
}
if (has_environment("APPDATA")) {
return get_environment("APPDATA");
}
return ".";
}
String OS_Windows::get_data_path() const {
@ -653,11 +652,9 @@ String OS_Windows::get_data_path() const {
return get_environment("XDG_DATA_HOME");
} else {
WARN_PRINT_ONCE("`XDG_DATA_HOME` is a relative path. Ignoring its value and falling back to `get_config_path()` per the XDG Base Directory specification.");
return get_config_path();
}
} else {
return get_config_path();
}
return get_config_path();
}
String OS_Windows::get_cache_path() const {
@ -667,13 +664,12 @@ String OS_Windows::get_cache_path() const {
return get_environment("XDG_CACHE_HOME");
} else {
WARN_PRINT_ONCE("`XDG_CACHE_HOME` is a relative path. Ignoring its value and falling back to `%TEMP%` or `get_config_path()` per the XDG Base Directory specification.");
return has_environment("TEMP") ? get_environment("TEMP") : get_config_path();
}
} else if (has_environment("TEMP")) {
return get_environment("TEMP");
} else {
return get_config_path();
}
if (has_environment("TEMP")) {
return get_environment("TEMP");
}
return get_config_path();
}
// Get properly capitalized engine name for system paths