From 4708a349aff60155e71841f0f44422860ab8d98b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 8 Feb 2001 15:44:00 +0000 Subject: [PATCH] fixed bug in Eof(), finally git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/stream.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 15d6b73c36..9763842c4a 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -669,7 +669,12 @@ bool wxInputStream::Eof() const char c; self->Read(&c, 1); - if ( GetLastError() == wxSTREAM_EOF ) + + // some streams can know that they're at EOF before actually trying to + // read beyond the end of stream (e.g. files) while others have no way of + // knowing it, so to provide the same behaviour in all cases we only + // return TRUE from here if the character really couldn't be read + if ( !self->LastRead() && GetLastError() == wxSTREAM_EOF ) { return TRUE; } -- 2.45.2