From f489770c107243bf0df0d60fe45a94bd568fe7ae Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 27 Nov 2005 17:55:00 +0000 Subject: [PATCH] Do CloseEntry internally when OpenEntry called on an already open stream. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/zipstrm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 92d972002c..0eb50af0da 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -1561,7 +1561,8 @@ bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw) return false; if (m_lasterror == wxSTREAM_READ_ERROR) return false; - wxCHECK(!IsOpened(), false); + if (IsOpened()) + CloseEntry(); m_raw = raw; @@ -1796,7 +1797,6 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) else { wxZipEntry current(m_entry); - CloseEntry(); if (!OpenEntry(current)) { m_lasterror = wxSTREAM_READ_ERROR; -- 2.45.2