Merge branch '0.6.x'

2015-06-13 21:14:41 +02:00
parent fac92e17aa 310d280cef
commit 89d593799c
3 changed files with 15 additions and 3 deletions
--- a/src/song.cpp
+++ b/src/song.cpp
@@ -76,7 +76,9 @@ std::string Song::getName(unsigned idx) const
 	assert(m_song);
 	mpd_song *s = m_song.get();
 	const char *res = mpd_song_get_tag(s, MPD_TAG_NAME, idx);
-	if (!res && idx > 0)
+	if (res)
+		return res;
+	else if (idx > 0)
 		return "";
 	const char *uri = mpd_song_get_uri(s);
 	const char *name = strrchr(uri, '/');