From: Andre Noll <maan@systemlinux.org>
Date: Sun, 25 Mar 2012 15:53:07 +0000 (+0200)
Subject: Merge branch 't/id3_conf'
X-Git-Tag: v0.4.10~3
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=e6bbb835a784a86ec3d3ca3f0420841087a8e940;hp=902ec3df25e1095b2a5c83d03ef6a1016e79d2f1;p=paraslash.git

Merge branch 't/id3_conf'

	configure: Add --with-id3tag-headers/libs.
	Link against libz if compiling with libid3tag support.
---

diff --git a/NEWS b/NEWS
index 5b875550..7c3ac3ce 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@
 	- para_audioc: Cleanups and memory leak fixes.
 	- Test 0004-server no longer fails if para_server is not
 	  being built.
+	- New configure options: --with-id3tag-{headers,libs}.
+
 
 -------------------------------------
 0.4.9 (2011-12-06) "hybrid causality"
diff --git a/mood.c b/mood.c
index 1a572cfa..f580400d 100644
--- a/mood.c
+++ b/mood.c
@@ -364,8 +364,10 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	char *mood_name;
 	struct osl_object mood_def;
 	struct mood_line_parser_data mlpd = {.line_num = 0};
-	int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+	int ret;
 
+	*m = NULL;
+	ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
 	if (ret < 0)
 		return ret;
 	if (!*mood_name)