--- trunk/backends/gstreamer/rb-player-gst-xfade.c	2009/03/20 03:02:36	6237
+++ trunk/backends/gstreamer/rb-player-gst-xfade.c	2009/03/20 05:03:50	6238
@@ -1288,7 +1288,7 @@
 
 	g_mutex_lock (stream->lock);
 
-	if (stream->needs_unlink == FALSE) {
+	if (stream->needs_unlink == FALSE || stream->adder_pad == NULL) {
 		rb_debug ("stream %s doesn't need to be unlinked", stream->uri);
 		g_mutex_unlock (stream->lock);
 		return;