diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-26 19:00:53 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-26 19:02:32 +0100 |
| commit | af9c67db0c998bbd6f0de1ab0af98f9e615e6029 (patch) | |
| tree | 018b3b3f6044e5c02cbaa1b44e01495e0013361c /drivers/unix | |
| parent | 9cf44c1c53f03b67143e606ab3d56680d73ac2c9 (diff) | |
| download | redot-engine-af9c67db0c998bbd6f0de1ab0af98f9e615e6029.tar.gz | |
Allow customizing user:// path (folder in OS::get_data_path())
This allows to specify any valid folder name (including with subfolders) to use
as user:// on all platforms. The folder is constrained to the platform-specific
OS::get_data_path() (typically what `XDG_DATA_HOME` resolves to).
Fixes #13236.
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 0d102902e8..0b1aebaaab 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -447,13 +447,17 @@ int OS_Unix::get_processor_count() const { String OS_Unix::get_user_data_dir() const { - String appname = get_safe_application_name(); + String appname = get_safe_dir_name(ProjectSettings::get_singleton()->get("application/config/name")); if (appname != "") { - bool use_godot_dir = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); - if (use_godot_dir) { - return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname); + bool use_custom_dir = ProjectSettings::get_singleton()->get("application/config/use_custom_user_dir"); + if (use_custom_dir) { + String custom_dir = get_safe_dir_name(ProjectSettings::get_singleton()->get("application/config/custom_user_dir_name"), true); + if (custom_dir == "") { + custom_dir = appname; + } + return get_data_path().plus_file(custom_dir); } else { - return get_data_path().plus_file(appname); + return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname); } } |