changeset 2647:2afc8e31a378 trunk

[svn] - this probably fixes bug #858
author nenolod
date Tue, 03 Apr 2007 11:54:52 -0700
parents db74f7ecf22d
children 51495131e4ae
files ChangeLog src/audacious/build_stamp.c src/audacious/vfs_buffered_file.c
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Mar 31 19:33:04 2007 -0700
+++ b/ChangeLog	Tue Apr 03 11:54:52 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-01 02:33:04 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4314]
+  - fix doublesize motion events. patch by gagern, closes #856.
+  
+  trunk/src/audacious/ui_main.c |    7 +++----
+  1 file changed, 3 insertions(+), 4 deletions(-)
+
+
 2007-03-26 16:21:40 +0000  Jonathan Schleifer <js@h3c.de>
   revision [4312]
   Don't show a warning dialog when trying to add .{jpeg,jpg,txt} files.
--- a/src/audacious/build_stamp.c	Sat Mar 31 19:33:04 2007 -0700
+++ b/src/audacious/build_stamp.c	Tue Apr 03 11:54:52 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070326-4312";
+const gchar *svn_stamp = "20070401-4314";
--- a/src/audacious/vfs_buffered_file.c	Sat Mar 31 19:33:04 2007 -0700
+++ b/src/audacious/vfs_buffered_file.c	Tue Apr 03 11:54:52 2007 -0700
@@ -60,7 +60,8 @@
     /* is this request within the buffered area, or should we switch to 
      * an FD? --nenolod
      */
-    if ((vfs_ftell(handle->buffer)) + (size * nmemb) > 
+    if (handle->which == FALSE && 
+	(vfs_ftell(handle->buffer)) + (size * nmemb) > 
 	((VFSBuffer *) handle->buffer->handle)->size)
     {
         vfs_fseek(handle->fd, vfs_ftell(handle->buffer), SEEK_SET);