# HG changeset patch
# User nhjm449
# Date 1156101636 25200
# Node ID c073fd82ded6734f5a36320bd23ccdf40ea4f482
# Parent  c4b78bc50412133ac3eacd7a68fbbdabfc4cadd5
[svn] - Don't explode when loading http streams from xspf files.

diff -r c4b78bc50412 -r c073fd82ded6 ChangeLog
--- a/ChangeLog	Sat Aug 19 20:53:12 2006 -0700
+++ b/ChangeLog	Sun Aug 20 12:20:36 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-20 03:53:12 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2095]
+  - use bmp_title_input_new(), as XMMS_NEW_TITLEINPUT() is a deprecated and unsafe API
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/Plugins/Container/xspf/xspf.c  
+
+
 2006-08-19 21:51:13 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2093]
   An include a day keeps the implicit declaration at bay.
diff -r c4b78bc50412 -r c073fd82ded6 audacious/playlist.c
--- a/audacious/playlist.c	Sat Aug 19 20:53:12 2006 -0700
+++ b/audacious/playlist.c	Sun Aug 20 12:20:36 2006 -0700
@@ -498,9 +498,11 @@
 		    tuple = entry->decoder->get_song_tuple(entry->filename);
     }
 
-    entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
-    entry->length = tuple->length;
-    entry->tuple = tuple;
+    if (tuple != NULL) {
+        entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
+        entry->length = tuple->length;
+        entry->tuple = tuple;
+    }
 
     PLAYLIST_UNLOCK();