Merge branch 'master' into windows-unicode

This commit is contained in:
Jordan Woyak
2013-03-02 15:33:32 -06:00
64 changed files with 1083 additions and 183 deletions

View File

@ -49,7 +49,8 @@ WiiWAD::WiiWAD(const std::string& _rName)
if (pReader == NULL || File::IsDirectory(_rName))
{
m_Valid = false;
return;
if(pReader) delete pReader;
return;
}
m_Valid = ParseWAD(*pReader);