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

Merge pull request #8642 from RandomShaper/fix-pack-get-curr-dir 

Fix infinite loop in DirAccessPack::get_current_dir()
This commit is contained in:
Rémi Verschelde 2017-05-05 23:02:07 +02:00 committed by GitHub
parent 120ce92e32 5c0188b5c3
commit e58519eb31
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/io/file_access_pack.cpp
View File

@ -440,13 +440,12 @@ Error DirAccessPack::change_dir(String p_dir) {
String DirAccessPack::get_current_dir() {
String p;
PackedData::PackedDir *pd = current;
while (pd->parent) {
String p = current->name;
if (pd != current)
p = "/" + p;
p = p + pd->name;
while (pd->parent) {
pd = pd->parent;
p = pd->name + "/" + p;
}
return "res://" + p;