X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=9e991da65d075c948ad704ed0ecdaead02c7ea45;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hp=f89235a484287ce2b5f5aa9081c38fd7a7a5d712;hpb=26a0b7e457d1dd7e0e40d866d28de00c5d1cfa54;p=paraslash.git

diff --git a/aft.c b/aft.c
index f89235a4..9e991da6 100644
--- a/aft.c
+++ b/aft.c
@@ -1276,8 +1276,10 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 		ret = get_score_and_aft_row(row, &score, &aft_row);
 		if (ret < 0)
 			return ret;
-	} else
+	} else {
 		aft_row = row;
+		score = 0;
+	}
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
@@ -1914,15 +1916,7 @@ out_free:
 		send_ret = sc_send_va_buffer(&pad->cc->scc,
 			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
-	if (afhi_ptr) {
-		free(afhi_ptr->chunk_table);
-		free(afhi_ptr->techinfo);
-		free(afhi_ptr->tags.artist);
-		free(afhi_ptr->tags.title);
-		free(afhi_ptr->tags.year);
-		free(afhi_ptr->tags.album);
-		free(afhi_ptr->tags.comment);
-	}
+	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
 	return send_ret;
 }