diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-20 22:17:59 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-20 23:47:43 +0100 |
| commit | 82b4ec22bee73966a29eb126024c9c337a3d4755 (patch) | |
| tree | eaabd2cf88230caa90b90237f032e0199f7da59e | |
| parent | 501f1e6de005eaa7e8937b85ebb6d3691326ac97 (diff) | |
| download | mpd-82b4ec22bee73966a29eb126024c9c337a3d4755.tar.gz mpd-82b4ec22bee73966a29eb126024c9c337a3d4755.tar.xz mpd-82b4ec22bee73966a29eb126024c9c337a3d4755.zip | |
PlaylistSong: recurse after applying base_uri
Allows applying map_to_relative_path() with base_uri.
| -rw-r--r-- | src/PlaylistSong.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx index 3366559d5..50f18abe9 100644 --- a/src/PlaylistSong.cxx +++ b/src/PlaylistSong.cxx @@ -136,10 +136,10 @@ playlist_check_translate_song(DetachedSong *song, const char *base_uri, base_uri = nullptr; } - std::string full_uri; if (base_uri != nullptr) { - full_uri = PathTraitsUTF8::Build(base_uri, uri); - uri = full_uri.c_str(); + song->SetURI(PathTraitsUTF8::Build(base_uri, uri)); + /* repeat the above checks */ + return playlist_check_translate_song(song, nullptr, secure); } DetachedSong *dest = playlist_check_load_song(song, uri, secure); |