diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
| commit | 5c0576ca5519d525c6c383cd138da917b67a2810 (patch) | |
| tree | 08a6f4b78ec2769265bb210e408a46b36f78be61 /src/playlist_song.c | |
| parent | 4e909f94113360933b77cf9e67ec54649d48665f (diff) | |
| parent | 039b3544902fe479fa2ce31f06de2c08377e0fc5 (diff) | |
| download | mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.gz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.xz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/player_control.c
src/player_thread.c
src/playlist_song.c
Diffstat (limited to 'src/playlist_song.c')
| -rw-r--r-- | src/playlist_song.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/playlist_song.c b/src/playlist_song.c index 8c966d549..afdc0cf9c 100644 --- a/src/playlist_song.c +++ b/src/playlist_song.c @@ -115,9 +115,7 @@ playlist_check_translate_song(struct song *song, const char *base_uri, if (g_path_is_absolute(uri)) { /* XXX fs_charset vs utf8? */ - char *prefix = base_uri != NULL - ? map_uri_fs(base_uri) - : map_directory_fs(db_get_root()); + char *prefix = map_directory_fs(db_get_root()); if (prefix != NULL && g_str_has_prefix(uri, prefix) && uri[strlen(prefix)] == '/') @@ -130,6 +128,7 @@ playlist_check_translate_song(struct song *song, const char *base_uri, return NULL; } + base_uri = NULL; g_free(prefix); } |