--- src/plugins/termtitle.py.orig	2005-09-10 01:17:38.000000000 +0200
+++ src/plugins/termtitle.py	2005-09-10 01:22:04.000000000 +0200
@@ -40,7 +40,7 @@
             raise RuntimeError("Terminal type not supported")
 
     def playbackinfochanged(self, event):
-        if event.playbackinfo.song != self.previoussong or event.playbackinfo.iscrossfading() != self.previouscross:
+        if event.playbackinfo.song and event.playbackinfo.song != self.previoussong or event.playbackinfo.iscrossfading() != self.previouscross:
             self.changetermtitle(event)
             self.previoussong = event.playbackinfo.song
             self.previouscross = event.playbackinfo.iscrossfading()
--- src/plugins/osdtitle.py.orig	2005-09-10 01:17:34.000000000 +0200
+++ src/plugins/osdtitle.py	2005-09-10 01:22:13.000000000 +0200
@@ -52,10 +52,9 @@
         self.previoussong = ''
 
     def playbackinfochanged(self, event):
-        if event.playbackinfo.song != self.previoussong:
-            if event.playbackinfo.song:
-                song = event.playbackinfo.song.format(self.config.songformat, safe=True)
-                os.system('echo "%s" | %s &' % (song, self.command))
+        if event.playbackinfo.song and event.playbackinfo.song != self.previoussong:
+            song = event.playbackinfo.song.format(self.config.songformat, safe=True)
+            os.system('echo "%s" | %s &' % (song, self.command))
             self.previoussong = event.playbackinfo.song
 
 # vim:ts=4:sw=4