ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed regression in ZIP file handling compared to version 3.7.5; 

the check for the required ZIP version was being too aggressive,
and causing some ZIP files to not open at all.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2716 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-05-03 10:45:49 +00:00
parent 42b0c26e3c
commit beb76ca378
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/ZipHandler.cxx
View File

@ -579,9 +579,13 @@ ZipHandler::zip_error
z_stream stream;
int zerr;
#if 0
// TODO - check newer versions of ZIP, and determine why this specific
// version (0x14) is important
/* make sure we don't need a newer mechanism */
if (zip->header.version_needed > 0x14)
return ZIPERR_UNSUPPORTED;
#endif
/* reset the stream */
memset(&stream, 0, sizeof(stream));

5
src/emucore/FSNode.cxx
View File

@ -96,10 +96,7 @@ FilesystemNode FilesystemNode::getParent() const
return *this;
AbstractFSNode* node = _realNode->getParent();
if (node == 0)
return *this;
else
return FilesystemNode(node);
return (node == 0) ? *this : FilesystemNode(node);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -