[Goodies-commits] r2860 - xfce4-cddrive-plugin/trunk/panel-plugin

[Sylvain Reynal]

Author: syl
Date: 2007-06-26 06:08:59 +0000 (Tue, 26 Jun 2007)
New Revision: 2860

Modified:
   xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c
Log:
safer audio_title freeing

Modified: xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c
===================================================================
--- xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c	2007-06-26 06:06:06 UTC (rev 2859)
+++ xfce4-cddrive-plugin/trunk/panel-plugin/cddrive-monitor.c	2007-06-26 06:08:59 UTC (rev 2860)
@@ -427,11 +427,8 @@
   g_free (monitor->udi);
   monitor->udi = NULL;
   
-  if (monitor->audio_title != NULL)
-    {
-      g_free (monitor->audio_title);
-      monitor->audio_title = NULL;
-    }
+  g_free (monitor->audio_title);
+  monitor->audio_title = NULL;
 }
 
 
@@ -756,6 +753,7 @@
 
   g_free (monitor->mount);
   g_free (monitor->unmount);
+  g_free (monitor->audio_title);
   g_free (monitor);
 }
 
@@ -1109,9 +1107,9 @@
 
   if (monitor->audio_title != NULL)
     /* title has been previously cached */
-      return monitor->audio_title;
+    return monitor->audio_title;
 
-  monitor->audio_title = cddrive_cddb_get_title (monitor->dev, monitor->use_cddb);
+  monitor->audio_title = cddrive_cddb_get_title (monitor->dev, monitor->use_cddb);  
   return monitor->audio_title;
 }