aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/DecoderThread.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-21 16:01:44 +0200
committerMax Kellermann <max@duempel.org>2015-06-21 16:06:02 +0200
commit90e7ace980fcfe4f894cd8e882fbfd2efba0b57d (patch)
treeb4810dd7c6fb09329e0e2c986aa2e0c6cae579fd /src/decoder/DecoderThread.cxx
parent2b0a127fa565c3e78d3a1e11f0fc68547dc5a161 (diff)
parentb0ff3bc7a30674fe44e946e228e8c2facd8e8377 (diff)
downloadmpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.gz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.xz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.zip
Merge tag 'v0.19.10'
Diffstat (limited to '')
-rw-r--r--src/decoder/DecoderThread.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx
index 98a8de540..2a7275a68 100644
--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@@ -378,7 +378,11 @@ decoder_run_song(DecoderControl &dc,
const DetachedSong &song, const char *uri, Path path_fs)
{
Decoder decoder(dc, dc.start_time.IsPositive(),
- new Tag(song.GetTag()));
+ /* pass the song tag only if it's
+ authoritative, i.e. if it's a local file -
+ tags on "stream" songs are just remembered
+ from the last time we played it*/
+ song.IsFile() ? new Tag(song.GetTag()) : nullptr);
dc.state = DecoderState::START;