Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do CloseEntry internally when OpenEntry called on an already open stream.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-27 17:55:00 +00:00
parent bebf40d5a0
commit f489770c10
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/zipstrm.cpp
View File

@@ -1561,7 +1561,8 @@ bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
return false; return false;
if (m_lasterror == wxSTREAM_READ_ERROR) if (m_lasterror == wxSTREAM_READ_ERROR)
return false; return false;
wxCHECK(!IsOpened(), false); if (IsOpened())
CloseEntry();
m_raw = raw; m_raw = raw;
@@ -1796,7 +1797,6 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
else else
{ {
wxZipEntry current(m_entry); wxZipEntry current(m_entry);
CloseEntry();
if (!OpenEntry(current)) if (!OpenEntry(current))
{ {
m_lasterror = wxSTREAM_READ_ERROR; m_lasterror = wxSTREAM_READ_ERROR;