CFileSystem::removeFileArchive now checking for normalized path + corresponding test now evaluated.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4136 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2012-04-16 16:44:13 +00:00
parent fb49e30c41
commit ef6296a57b
4 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,9 @@
Changes in 1.8 (??.??.2011)
- CFileSystem::removeFileArchive now checking for normalized path
- Fix zip's with passwords on 64-bit systems (thx @ Dr. Gladman for writing the bugfix)
- replace asserts in tests with macro assert_log to allow running all tests through on problems.
- added IGUIElement::setName and IGUIElement::getName (similar to ISceneNode)

View File

@ -458,9 +458,10 @@ bool CFileSystem::removeFileArchive(u32 index)
//! removes an archive from the file system.
bool CFileSystem::removeFileArchive(const io::path& filename)
{
const path absPath = getAbsolutePath(filename);
for (u32 i=0; i < FileArchives.size(); ++i)
{
if (filename == FileArchives[i]->getFileList()->getPath())
if (absPath == FileArchives[i]->getFileList()->getPath())
return removeFileArchive(i);
}
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;

View File

@ -458,7 +458,7 @@ bool archiveReader()
// logTestString("Testing complex mount file.\n");
// ret &= testMountFile(fs);
logTestString("Testing add/remove with filenames.\n");
testAddRemove(fs, "media/file_with_path.zip");
ret &= testAddRemove(fs, "media/file_with_path.zip");
device->closeDevice();
device->run();

View File

@ -1,4 +1,4 @@
Tests finished. 1 test of 1 passed.
Compiled as RELEASE
Test suite pass at GMT Tue Apr 3 20:04:39 2012
Compiled as DEBUG
Test suite pass at GMT Mon Apr 16 16:38:07 2012