[Gnash-commit] /srv/bzr/gnash/trunk r11608: Actually don't even complain when readNonBlocking is called while in error condition

[Sandro Santilli]

------------------------------------------------------------
revno: 11608
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2009-11-06 14:21:33 +0100
message:
  Actually don't even complain when readNonBlocking is called while in error 
condition
modified:
  libbase/curl_adapter.cpp

=== modified file 'libbase/curl_adapter.cpp'
--- a/libbase/curl_adapter.cpp  2009-11-06 13:12:39 +0000
+++ b/libbase/curl_adapter.cpp  2009-11-06 13:21:33 +0000
@@ -1077,18 +1077,12 @@
 std::streamsize
 CurlStreamFile::readNonBlocking(void *dst, std::streamsize bytes)
 {
-       if ( eof() ) return 0;
-       if ( _error )
-       {
-               log_error("curl adaptor's readNonBlocking called while _error 
!= 0 "
-                "- should we throw an exception?");
-               return 0;
-       }
-
 #ifdef GNASH_CURL_VERBOSE
        log_debug ("readNonBlocking(%d) called", bytes);
 #endif
 
+       if ( eof() || _error ) return 0;
+
        fillCacheNonBlocking();
        if ( _error )
        {