Merge branch 'master' into wii-network

This commit is contained in:
Matthew Parlane 2013-01-28 22:00:47 +13:00
commit 2dd077028f
110 changed files with 949 additions and 411 deletions

View file

@ -512,12 +512,24 @@ bool DeleteDirRecursively(const std::string &directory)
if (IsDirectory(newPath))
{
if (!DeleteDirRecursively(newPath))
{
#ifndef _WIN32
closedir(dirp);
#endif
return false;
}
}
else
{
if (!File::Delete(newPath))
{
#ifndef _WIN32
closedir(dirp);
#endif
return false;
}
}
#ifdef _WIN32