# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1217262994 18000
# Node ID 34e0d0de2018d46aa758dea4e7c63294e8d1ff68
# Parent  df6cd6f44a4fba788acf44d4223790209e06036f# Parent  89891f400f9833f4d84f2aa9066b61e6afd99831
branch merge.

diff -r df6cd6f44a4f -r 34e0d0de2018 src/audacious/playlist.c
--- a/src/audacious/playlist.c	Thu Jul 24 15:32:42 2008 +0200
+++ b/src/audacious/playlist.c	Mon Jul 28 11:36:34 2008 -0500
@@ -2437,9 +2437,10 @@
                     /* Entry disappeared while we looked it up.
                        Restart. */
                     node = playlist->entries;
-                else if (entry->tuple != NULL && 
+                else if ((entry->tuple != NULL) ||
+			 (entry->title != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
-                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)
+                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1))
                 {
                     update_playlistwin = TRUE;
                     break; /* hmmm... --asphyx */
@@ -2488,9 +2489,10 @@
                         node = g_list_nth(playlist->entries,
                                           playlistwin_get_toprow());
                 }
-                else if (entry->tuple != NULL && 
+                else if ((entry->tuple != NULL) ||
+			 (entry->title != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
-                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) {
+                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)) {
                     update_playlistwin = TRUE;
                 }
             }