asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7172 from Faless/fix_localize_path

Browse source 
Properly localize absolute path that starts with the resource folder.
This commit is contained in:
Rémi Verschelde 2016-11-22 10:16:41 +01:00 committed by GitHub
commit 830ab4ea8d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/globals.cpp
View file

@ -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();