mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 02:24:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'vfsfix'

Browse source
This commit is contained in:
fgenesis 2013-11-05 16:47:24 +01:00
commit c60e2c3757
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ExternalLibs/ttvfs/VFSDir.cpp
View file

@ -97,6 +97,10 @@ bool VFSDir::merge(VFSDir *dir, bool overwrite, EntryFlags flag)
if(dir == this) if(dir == this)
return true; // nothing to do then return true; // nothing to do then
// HACK: make sure the files are there before merging
this->load(false);
dir->load(false);
bool result = false; bool result = false;
VFS_GUARD_OPT(this); VFS_GUARD_OPT(this);