X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=62db6e7b42bf663af95df97e6764c5ee8891fffc;hb=518a2727540cf5e105d28aa8fd31bb6afad05bf6;hp=95de88011a31f2c8780ef11ff1c9b434b1e5b83a;hpb=74cfed2536a16ca85bc0ce97f6bf307c96ae0d3d;p=paraslash.git

diff --git a/aft.c b/aft.c
index 95de8801..62db6e7b 100644
--- a/aft.c
+++ b/aft.c
@@ -816,20 +816,16 @@ static char *make_lyrics_lines(struct afs_info *afsi)
 	char *lyrics_name;
 
 	lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
-	if (!lyrics_name)
-		return make_message("lyrics_id: %u\n", afsi->lyrics_id);
 	return make_message("lyrics_id: %u\nlyrics_name: %s\n",
-		afsi->lyrics_id, lyrics_name);
+		afsi->lyrics_id, lyrics_name? lyrics_name : "(none)");
 }
 
 static char *make_image_lines(struct afs_info *afsi)
 {
 	char *image_name;
 	img_get_name_by_id(afsi->image_id, &image_name);
-	if (!image_name)
-		return make_message("image_id: %u\n", afsi->image_id);
 	return make_message("image_id: %u\nimage_name: %s\n",
-		afsi->image_id, image_name);
+		afsi->image_id, image_name? image_name : "(none)");
 }
 
 static int print_list_item(struct ls_data *d, struct ls_options *opts,