X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/421db2ada5702924d874c8c11e4a6fa0129ecaa5..32a2907bd33438d2119d587aa9656c0d94e6e460:/src/common/stream.cpp?ds=sidebyside

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;
     }