diff src/audacious/vfs_buffered_file.c @ 2372:d68e6f302855 trunk

[svn] - that should have been in vfs_fread

--- a/src/audacious/vfs_buffered_file.c	Sat Jan 20 03:07:30 2007 -0800
+++ b/src/audacious/vfs_buffered_file.c	Sat Jan 20 03:39:28 2007 -0800
@@ -55,6 +55,13 @@
 {
     VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
 
+    /* is this request within the buffered area, or should we switch to 
+     * an FD? --nenolod
+     */
+    if ((vfs_ftell(handle->buffer)) + (size * nmemb) >= 
+	((VFSBuffer *) handle->buffer->handle)->size)
+        handle->which = TRUE;
+
     return vfs_fread(i_ptr, size, nmemb, handle->which == TRUE ? handle->fd : handle->buffer);
 }
 
@@ -77,7 +84,7 @@
     /* is this request within the buffered area, or should we switch to 
      * an FD? --nenolod
      */
-    if ((vfs_ftell(handle->buffer)) + (size * nmemb) >= 
+    if ((vfs_ftell(handle->buffer)) + 1 >= 
 	((VFSBuffer *) handle->buffer->handle)->size)
         handle->which = TRUE;