# HG changeset patch
# User yaz
# Date 1169914935 28800
# Node ID e832d49810089fd569d78cdcc2c8de917de3042d
# Parent  64948ea58c53c5ee863f52e26f13716cdfed1262
[svn] - make sure tooltip_file != NULL otherwise filepopup may crash in strcmp().

diff -r 64948ea58c53 -r e832d4981008 ChangeLog
--- a/ChangeLog	Sat Jan 27 07:34:13 2007 -0800
+++ b/ChangeLog	Sat Jan 27 08:22:15 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-27 15:34:13 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [3864]
+  - revise logic of r3808 so that cdaudio works again.
+  
+  trunk/src/audacious/input.c |    5 +----
+  1 file changed, 1 insertion(+), 4 deletions(-)
+
+
 2007-01-27 14:09:45 +0000  Michael Farber <01mf02@gmail.com>
   revision [3862]
   - removed xmms_ prefix from formatter
diff -r 64948ea58c53 -r e832d4981008 src/audacious/ui_fileinfopopup.c
--- a/src/audacious/ui_fileinfopopup.c	Sat Jan 27 07:34:13 2007 -0800
+++ b/src/audacious/ui_fileinfopopup.c	Sat Jan 27 08:22:15 2007 -0800
@@ -281,8 +281,8 @@
 
   if ( ( time != -1 ) &&
        ( length != -1 ) &&
-       ( ( current_file != NULL ) && ( !strcmp(tooltip_file,current_file) ) &&
-         ( cfg.filepopup_showprogressbar ) ) )
+       ( ( current_file != NULL ) && ( tooltip_file != NULL ) &&
+	 ( !strcmp(tooltip_file, current_file) ) && ( cfg.filepopup_showprogressbar ) ) )
   {
     gchar *progress_time = g_strdup_printf("%d:%02d", time / 60000, (time / 1000) % 60);
     gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR(progressbar) , (gdouble)time / (gdouble)length );