aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-10-11 23:41:39 -0700
committerEric Wong <normalperson@yhbt.net>2008-10-12 05:23:29 -0700
commit20f2816ebc066e64f7800011895e9a693a031767 (patch)
tree2b612c2a5e30864ff69ace5c4877c2e7b12d4093
parent0df62a2c3cb7af88347d40a17cc336b5d1740f62 (diff)
downloadmpd-20f2816ebc066e64f7800011895e9a693a031767.tar.gz
mpd-20f2816ebc066e64f7800011895e9a693a031767.tar.xz
mpd-20f2816ebc066e64f7800011895e9a693a031767.zip
song: fix up mismerge that broke songs in music_root
-rw-r--r--src/song.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/song.c b/src/song.c
index aa6641020..12fea7b6d 100644
--- a/src/song.c
+++ b/src/song.c
@@ -85,7 +85,7 @@ void song_free(struct mpd_song * song)
ssize_t song_print_url(struct mpd_song *song, int fd)
{
- if (song->parent && song->parent->path)
+ if (song->parent && !isRootDirectory(song->parent->path))
return fdprintf(fd, "%s%s/%s\n", SONG_FILE,
directory_get_path(song->parent), song->url);
return fdprintf(fd, "%s%s\n", SONG_FILE, song->url);