# HG changeset patch
# User nenolod
# Date 1145839580 25200
# Node ID b082b5c7746174b01e615e0b2d197ed8aeaebed7
# Parent  ff0cc786ebeb6fd915c1c27b87c3ac3fbcfe80d0
[svn] - fix crashing with taglib

diff -r ff0cc786ebeb -r b082b5c77461 Plugins/Input/mpg123/fileinfo.c
--- a/Plugins/Input/mpg123/fileinfo.c	Sun Apr 23 17:11:06 2006 -0700
+++ b/Plugins/Input/mpg123/fileinfo.c	Sun Apr 23 17:46:20 2006 -0700
@@ -700,6 +700,8 @@
 fill_entries(GtkWidget * w, gpointer data)
 {
   VFSFile *fh;
+  gchar *ptr;
+  guint32 i;
 
   if (str_has_prefix_nocase(current_filename, "http://"))
     return;
@@ -710,13 +712,49 @@
     taglib_ap = taglib_file_audioproperties(taglib_file);
   } else return;
 
-  gtk_entry_set_text(GTK_ENTRY(title_entry), taglib_tag_title(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(artist_entry), taglib_tag_artist(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(album_entry), taglib_tag_album(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(comment_entry), taglib_tag_comment(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(year_entry), (gchar*)taglib_tag_year(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(tracknum_entry), (gchar*)taglib_tag_track(taglib_tag));
-  gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), taglib_tag_genre(taglib_tag));
+  /* be sane here, taglib_tag results may be NULL --nenolod */
+  ptr = taglib_tag_title(taglib_tag);
+
+  if (ptr != NULL)
+	gtk_entry_set_text(GTK_ENTRY(title_entry), ptr);
+
+  ptr = taglib_tag_artist(taglib_tag);
+
+  if (ptr != NULL)
+	gtk_entry_set_text(GTK_ENTRY(artist_entry), ptr);
+
+  ptr = taglib_tag_album(taglib_tag);
+
+  if (ptr != NULL)
+	gtk_entry_set_text(GTK_ENTRY(album_entry), ptr);
+
+  ptr = taglib_tag_comment(taglib_tag);
+
+  if (ptr != NULL)
+	gtk_entry_set_text(GTK_ENTRY(comment_entry), ptr);
+
+  i = taglib_tag_year(taglib_tag);
+
+  if (i != 0)
+  {
+	ptr = g_strdup_printf("%d", i);
+	gtk_entry_set_text(GTK_ENTRY(year_entry), ptr);
+	g_free(ptr);
+  }
+
+  i = taglib_tag_track(taglib_tag);
+
+  if (i != 0)
+  {
+	ptr = g_strdup_printf("%d", i);
+	gtk_entry_set_text(GTK_ENTRY(tracknum_entry), ptr);
+	g_free(ptr);
+  }
+
+  ptr = taglib_tag_genre(taglib_tag);
+
+  if (ptr != NULL)
+	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), ptr);
 
   gtk_widget_set_sensitive(GTK_WIDGET(w), FALSE);
   gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);