aboutsummaryrefslogtreecommitdiffstats
path: root/src/mapper.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/mapper.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mapper.c b/src/mapper.c
index b1ac6f86c..1b704e55e 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -96,9 +96,12 @@ map_directory_child_fs(const struct directory *directory, const char *name,
const char *
map_song_fs(const struct song *song, char *buffer)
{
- assert(song->parent != NULL);
+ assert(song_is_file(song));
- return map_directory_child_fs(song->parent, song->url, buffer);
+ if (song_in_database(song))
+ return map_directory_child_fs(song->parent, song->url, buffer);
+ else
+ return utf8_to_fs_charset(buffer, song->url);
}
const char *