diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-09 14:03:47 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-09 14:04:11 +0100 |
| commit | d62a738460c2647187384eaaf31c9aebcdda3b9d (patch) | |
| tree | 3fb8545b309370108ed9875940c288c52d15cb0a | |
| parent | 0f1b1bb44d7dfea657116ef7bf1c4d8fd5cbce24 (diff) | |
| parent | 0cfd4fff62be0e2fd16041347ba7dfa7b84fec11 (diff) | |
| download | mpd-d62a738460c2647187384eaaf31c9aebcdda3b9d.tar.gz mpd-d62a738460c2647187384eaaf31c9aebcdda3b9d.tar.xz mpd-d62a738460c2647187384eaaf31c9aebcdda3b9d.zip | |
Merge branch 'v0.19.x'
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/playlist/Print.cxx | 13 |
2 files changed, 11 insertions, 6 deletions
@@ -12,6 +12,10 @@ ver 0.20 (not yet released) * reset song priority on playback * remove dependency on GLib +ver 0.19.7 (not yet released) +* playlist + - don't skip non-existent songs in "listplaylist" + ver 0.19.6 (2014/12/08) * decoder - ffmpeg: support FFmpeg 2.5 diff --git a/src/playlist/Print.cxx b/src/playlist/Print.cxx index 0db2a4ab0..8f743f56d 100644 --- a/src/playlist/Print.cxx +++ b/src/playlist/Print.cxx @@ -43,12 +43,13 @@ playlist_provider_print(Client &client, const char *uri, DetachedSong *song; while ((song = e.NextSong()) != nullptr) { if (playlist_check_translate_song(*song, base_uri.c_str(), - loader)) { - if (detail) - song_print_info(client, *song); - else - song_print_uri(client, *song); - } + loader) && + detail) + song_print_info(client, *song); + else + /* fallback if no detail was requested or no + detail was available */ + song_print_uri(client, *song); delete song; } |