changeset 4106:75d1366e43a4

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Dec 2007 23:05:33 -0600
parents 0d300e0b0001 (diff) 7b01df6730eb (current diff)
children db3f9b548226
files
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/playlist.c	Mon Dec 24 23:46:52 2007 +0100
+++ b/src/audacious/playlist.c	Mon Dec 24 23:05:33 2007 -0600
@@ -227,9 +227,10 @@
 
     /* renew tuple if file mtime is newer than tuple mtime. */
     if (entry->tuple){
-        if (tuple_get_int(entry->tuple, FIELD_MTIME, NULL) == modtime)
+        if (tuple_get_int(entry->tuple, FIELD_MTIME, NULL) == modtime) {
+            g_free(pr);
             return TRUE;
-        else {
+        } else {
             mowgli_object_unref(entry->tuple);
             entry->tuple = NULL;
         }
@@ -240,8 +241,10 @@
     else if (entry->decoder != NULL && entry->decoder->get_song_tuple != NULL)
         tuple = entry->decoder->get_song_tuple(entry->filename);
 
-    if (tuple == NULL)
+    if (tuple == NULL) {
+        g_free(pr);
         return FALSE;
+    }
 
     /* attach mtime */
     tuple_associate_int(tuple, FIELD_MTIME, NULL, modtime);