X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2825b3f502d4ae3be76027d033aa18d57cd28bb1..0b556b005eddd5bf5d04f01eaba6b313d8305d1a:/src/common/fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 1c0337284e..071b90f243 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -494,21 +494,21 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
         wxString strTmp;
 
         char buf[1024];
-        for ( ;; )
+        do
         {
             inStream.Read(buf, WXSIZEOF(buf));
 
-            if ( !inStream.IsOk() )
+            const wxStreamError err = inStream.GetLastError();
+
+            if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
             {
                 wxLogError(_("Error reading config options."));
                 break;
             }
 
             strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
-
-            if ( inStream.Eof() )
-                break;
         }
+        while ( !inStream.Eof() );
 
         strTrans = wxTextBuffer::Translate(strTmp);
     }