diff options
| author | Max Kellermann <max@duempel.org> | 2011-05-09 18:00:41 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-05-09 18:05:11 +0200 |
| commit | 26735390fffaa467bf90041a5c380802602affb6 (patch) | |
| tree | 6ebb28de3f3efd11617208f054568c7763968ee4 | |
| parent | 9402b23dd5f75388cb48fdf04ca62033dfc6709a (diff) | |
| download | mpd-26735390fffaa467bf90041a5c380802602affb6.tar.gz mpd-26735390fffaa467bf90041a5c380802602affb6.tar.xz mpd-26735390fffaa467bf90041a5c380802602affb6.zip | |
playlist_song: fix playlist files in base music directory
g_path_get_dirname() returns "." when there is no directory name in
the given path. This patch adds a workaround for that.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/playlist_song.c | 7 |
2 files changed, 8 insertions, 0 deletions
@@ -1,6 +1,7 @@ ver 0.16.3 (2011/??/??) * fix assertion failure in audio format mask parser * fix NULL pointer dereference in playlist parser +* fix playlist files in base music directory * decoder: - ffmpeg: support libavcodec 0.7 diff --git a/src/playlist_song.c b/src/playlist_song.c index 2ad63c913..1a543a0b8 100644 --- a/src/playlist_song.c +++ b/src/playlist_song.c @@ -105,6 +105,13 @@ playlist_check_translate_song(struct song *song, const char *base_uri) } } + if (base_uri != NULL && strcmp(base_uri, ".") == 0) + /* g_path_get_dirname() returns "." when there is no + directory name in the given path; clear that now, + because it would break the database lookup + functions */ + base_uri = NULL; + if (g_path_is_absolute(uri)) { /* XXX fs_charset vs utf8? */ char *prefix = base_uri != NULL |