From 20f2816ebc066e64f7800011895e9a693a031767 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 11 Oct 2008 23:41:39 -0700 Subject: song: fix up mismerge that broke songs in music_root --- src/song.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3