# HG changeset patch
# User nenolod
# Date 1171987900 28800
# Node ID a221f10fd105a747de41a0d7c0b0c54ac3d58a17
# Parent  22da0618297e077c9f827d2cad8c9cfc54fe4a58
[svn] - or comparison should be an and comparison

diff -r 22da0618297e -r a221f10fd105 ChangeLog
--- a/ChangeLog	Tue Feb 20 07:35:05 2007 -0800
+++ b/ChangeLog	Tue Feb 20 08:11:40 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-20 15:35:05 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4120]
+  - handle MS-DOS line endings.
+  
+  trunk/src/audacious/util.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-02-20 12:54:56 +0000  Jonathan Schleifer <js@h3c.de>
   revision [4118]
   Use VFS.
diff -r 22da0618297e -r a221f10fd105 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Tue Feb 20 07:35:05 2007 -0800
+++ b/src/audacious/build_stamp.c	Tue Feb 20 08:11:40 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070220-4118";
+const gchar *svn_stamp = "20070220-4120";
diff -r 22da0618297e -r a221f10fd105 src/audacious/util.c
--- a/src/audacious/util.c	Tue Feb 20 07:35:05 2007 -0800
+++ b/src/audacious/util.c	Tue Feb 20 08:11:40 2007 -0800
@@ -518,7 +518,7 @@
             if (off >= filesize)
                 goto return_sequence;
 
-            while (buffer[off] != '\n' || buffer[off] != '\r')
+            while (buffer[off] != '\n' && buffer[off] != '\r')
             {
                 g_string_append_c(value, buffer[off]);
                 off++;