diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-10-30 18:22:05 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-11-22 09:09:39 +0100 |
| commit | cdc97ca4535e99fdcb10f21c4609c2f79e94589b (patch) | |
| tree | e8b616c74a47a31a8b058429199d2b2c223dc7bb /core/globals.cpp | |
| parent | 9e2d09f580c319e511d3a816bba8a54138a4bcd1 (diff) | |
Properly localize absolute path.
Calling localize_path will return a localized path in res:// if the
path starts with the resource file-system/folder, and will return
the unchanged absolute path otherwise.
Closes #6979 and #7161.
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index bef40ff330..78b97882be 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -54,7 +54,8 @@ String Globals::localize_path(const String& p_path) const { if (resource_path=="") return p_path; //not initialied yet - if (p_path.begins_with("res://") || p_path.begins_with("user://") || p_path.is_abs_path()) + if (p_path.begins_with("res://") || p_path.begins_with("user://") || + (p_path.is_abs_path() && !p_path.begins_with(resource_path))) return p_path.simplify_path(); |