changeset 1253:665dfbf5e9a1 trunk

[svn] - playlist_compare_artist(): more sanity checking.
author nenolod
date Thu, 15 Jun 2006 05:50:10 -0700
parents ece68ef26b94
children 066e2607a999
files ChangeLog audacious/playlist.c
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 15 05:17:49 2006 -0700
+++ b/ChangeLog	Thu Jun 15 05:50:10 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-15 12:17:49 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1418]
+  - we don't really have to unwire track 0 this way, as 0 will be selected by default if no subsong URI is given
+  
+
+  Changes:        Modified:
+  +1 -4           trunk/Plugins/Input/console/Audacious_Driver.cpp  
+
+
 2006-06-15 12:07:23 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1416]
   - sort by Artist
--- a/audacious/playlist.c	Thu Jun 15 05:17:49 2006 -0700
+++ b/audacious/playlist.c	Thu Jun 15 05:50:10 2006 -0700
@@ -1802,15 +1802,15 @@
     if (b->tuple != NULL)
         playlist_entry_get_info(b);
 
-    if (a->tuple->performer != NULL)
+    if (a->tuple != NULL && a->tuple->performer != NULL)
         a_artist = a->tuple->performer;
-    if (b->tuple->performer != NULL)
+    if (b->tuple != NULL && b->tuple->performer != NULL)
         b_artist = b->tuple->performer;
 
     if (a_artist != NULL && b_artist != NULL)
         return strcasecmp(a_artist, b_artist);
 
-    return -1;
+    return 0;
 }
 
 static gint