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

Fix localize_path not always working 

We make sure the resource dir path ends with a trailing '/' for safety reasons, so we must make sure the path we compare it to does so as well.
This commit is contained in:
Ignacio Etcheverry 2019-07-03 09:53:52 +02:00
parent aa9908e4f6
commit 0639946c72
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/project_settings.cpp
View File

@ -83,6 +83,10 @@ String ProjectSettings::localize_path(const String &p_path) const {
// `plus_file("")` is an easy way to ensure we have a trailing '/'. // `plus_file("")` is an easy way to ensure we have a trailing '/'.
const String res_path = resource_path.plus_file(""); const String res_path = resource_path.plus_file("");
// DirAccess::get_current_dir() is not guaranteed to return a path that with a trailing '/',
// so we must make sure we have it as well in order to compare with 'res_path'.
cwd = cwd.plus_file("");
if (!cwd.begins_with(res_path)) { if (!cwd.begins_with(res_path)) {
return p_path; return p_path;
}; };