X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..40e32bca6c12a7068cded7cf5a39381e78b1b6b1:/src/common/zstream.cpp diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 7309afc292..7afa0548ff 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -238,20 +238,20 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, m_lasterror = wxSTREAM_WRITE_ERROR; } -wxZlibOutputStream::~wxZlibOutputStream() -{ - if (m_deflate && m_z_buffer) - DoFlush(true); - deflateEnd(m_deflate); - delete m_deflate; +bool wxZlibOutputStream::Close() + { + DoFlush(true); + deflateEnd(m_deflate); + delete m_deflate; - delete[] m_z_buffer; -} + m_deflate = NULL; + delete[] m_z_buffer; + m_z_buffer = NULL; + return IsOk(); + } void wxZlibOutputStream::DoFlush(bool final) { - wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open")); - if (!m_deflate || !m_z_buffer) m_lasterror = wxSTREAM_WRITE_ERROR; if (!IsOk())