X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af850422ad0402f041a067c2b07d6586f80910f9..0425151023593cb31da0ee0a652da173ca9abfde:/src/common/zstream.cpp diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 4c7a7bf0ec..f1380d5b64 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -89,17 +89,17 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) m_inflate->next_in = m_z_buffer; m_inflate->avail_in = m_parent_i_stream->LastRead(); - if (m_parent_i_stream->LastError() != wxStream_NOERROR && - m_parent_i_stream->LastError() != wxStream_EOF) + wxStreamError err = m_parent_i_stream->GetLastError(); + if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { - m_lasterror = m_parent_i_stream->LastError(); + m_lasterror = err; return 0; // failed to read anything } if ( m_inflate->avail_in == 0 ) { // EOF - m_lasterror = wxStream_EOF; + m_lasterror = wxSTREAM_EOF; break; } } @@ -210,7 +210,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) if (m_deflate->avail_out == 0) { m_parent_o_stream->Write(m_z_buffer, m_z_size); - if (m_parent_o_stream->LastError() != wxStream_NOERROR) + if ( !*m_parent_o_stream ) return (size - m_deflate->avail_in); m_deflate->next_out = m_z_buffer;